/* Implementation of the GDB variable objects API.
- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 1999-2019 Free Software Foundation, Inc.
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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "exceptions.h"
#include "value.h"
#include "expression.h"
#include "frame.h"
#include "language.h"
-#include "wrapper.h"
#include "gdbcmd.h"
#include "block.h"
-
-#include "gdb_assert.h"
-#include "gdb_string.h"
+#include "valprint.h"
+#include "gdb_regex.h"
#include "varobj.h"
-#include "vec.h"
#include "gdbthread.h"
#include "inferior.h"
+#include "varobj-iter.h"
+#include "parser-defs.h"
+#include "gdbarch.h"
+
+#if HAVE_PYTHON
+#include "python/python.h"
+#include "python/python-internal.h"
+#else
+typedef int PyObject;
+#endif
-/* Non-zero if we want to see trace of varobj level stuff. */
+/* See varobj.h. */
-int varobjdebug = 0;
+unsigned int varobjdebug = 0;
static void
show_varobjdebug (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
fprintf_filtered (file, _("Varobj debugging is %s.\n"), value);
}
-/* String representations of gdb's format codes */
-char *varobj_format_string[] =
- { "natural", "binary", "decimal", "hexadecimal", "octal" };
+/* String representations of gdb's format codes. */
+const char *varobj_format_string[] =
+ { "natural", "binary", "decimal", "hexadecimal", "octal", "zero-hexadecimal" };
-/* String representations of gdb's known languages */
-char *varobj_language_string[] = { "unknown", "C", "C++", "Java" };
+/* True if we want to allow Python-based pretty-printing. */
+static bool pretty_printing = false;
+
+void
+varobj_enable_pretty_printing (void)
+{
+ pretty_printing = true;
+}
/* Data structures */
/* Every root variable has one of these structures saved in its
- varobj. Members which must be free'd are noted. */
+ varobj. */
struct varobj_root
{
+ /* The expression for this parent. */
+ expression_up exp;
- /* Alloc'd expression for this parent. */
- struct expression *exp;
-
- /* Block for which this expression is valid */
- struct block *valid_block;
+ /* Block for which this expression is valid. */
+ const struct block *valid_block = NULL;
/* The frame for this expression. This field is set iff valid_block is
not NULL. */
- struct frame_id frame;
+ struct frame_id frame = null_frame_id;
- /* The thread ID that this varobj_root belong to. This field
- is only valid if valid_block is not NULL.
+ /* The global thread ID that this varobj_root belongs to. This field
+ is only valid if valid_block is not NULL.
When not 0, indicates which thread 'frame' belongs to.
When 0, indicates that the thread list was empty when the varobj_root
was created. */
- int thread_id;
+ int thread_id = 0;
- /* If 1, the -var-update always recomputes the value in the
+ /* If true, the -var-update always recomputes the value in the
current thread and frame. Otherwise, variable object is
- always updated in the specific scope/thread/frame */
- int floating;
+ always updated in the specific scope/thread/frame. */
+ bool floating = false;
- /* Flag that indicates validity: set to 0 when this varobj_root refers
+ /* Flag that indicates validity: set to false when this varobj_root refers
to symbols that do not exist anymore. */
- int is_valid;
+ bool is_valid = true;
- /* Language info for this variable and its children */
- struct language_specific *lang;
+ /* Language-related operations for this variable and its
+ children. */
+ const struct lang_varobj_ops *lang_ops = NULL;
- /* The varobj for this root node. */
- struct varobj *rootvar;
+ /* The varobj for this root node. */
+ struct varobj *rootvar = NULL;
/* Next root variable */
- struct varobj_root *next;
+ struct varobj_root *next = NULL;
};
-/* Every variable in the system has a structure of this type defined
- for it. This structure holds all information necessary to manipulate
- a particular object variable. Members which must be freed are noted. */
-struct varobj
-{
-
- /* Alloc'd name of the variable for this object.. If this variable is a
- child, then this name will be the child's source name.
- (bar, not foo.bar) */
- /* NOTE: This is the "expression" */
- char *name;
-
- /* Alloc'd expression for this child. Can be used to create a
- root variable corresponding to this child. */
- char *path_expr;
-
- /* The alloc'd name for this variable's object. This is here for
- convenience when constructing this object's children. */
- char *obj_name;
-
- /* Index of this variable in its parent or -1 */
- int index;
-
- /* The type of this variable. This can be NULL
- for artifial variable objects -- currently, the "accessibility"
- variable objects in C++. */
- struct type *type;
-
- /* The value of this expression or subexpression. A NULL value
- indicates there was an error getting this value.
- Invariant: if varobj_value_is_changeable_p (this) is non-zero,
- the value is either NULL, or not lazy. */
- struct value *value;
-
- /* The number of (immediate) children this variable has */
- int num_children;
-
- /* If this object is a child, this points to its immediate parent. */
- struct varobj *parent;
-
- /* Children of this object. */
- VEC (varobj_p) *children;
-
- /* Description of the root variable. Points to root variable for children. */
- struct varobj_root *root;
+/* Dynamic part of varobj. */
- /* The format of the output for this object */
- enum varobj_display_formats format;
-
- /* Was this variable updated via a varobj_set_value operation */
- int updated;
+struct varobj_dynamic
+{
+ /* Whether the children of this varobj were requested. This field is
+ used to decide if dynamic varobj should recompute their children.
+ In the event that the frontend never asked for the children, we
+ can avoid that. */
+ bool children_requested = false;
- /* Last print value. */
- char *print_value;
+ /* The pretty-printer constructor. If NULL, then the default
+ pretty-printer will be looked up. If None, then no
+ pretty-printer will be installed. */
+ PyObject *constructor = NULL;
- /* Is this variable frozen. Frozen variables are never implicitly
- updated by -var-update *
- or -var-update <direct-or-indirect-parent>. */
- int frozen;
+ /* The pretty-printer that has been constructed. If NULL, then a
+ new printer object is needed, and one will be constructed. */
+ PyObject *pretty_printer = NULL;
- /* Is the value of this variable intentionally not fetched? It is
- not fetched if either the variable is frozen, or any parents is
- frozen. */
- int not_fetched;
-};
+ /* The iterator returned by the printer's 'children' method, or NULL
+ if not available. */
+ struct varobj_iter *child_iter = NULL;
-struct cpstack
-{
- char *name;
- struct cpstack *next;
+ /* We request one extra item from the iterator, so that we can
+ report to the caller whether there are more items than we have
+ already reported. However, we don't want to install this value
+ when we read it, because that will mess up future updates. So,
+ we stash it here instead. */
+ varobj_item *saved_item = NULL;
};
/* A list of varobjs */
/* Private function prototypes */
-/* Helper functions for the above subcommands. */
+/* Helper functions for the above subcommands. */
-static int delete_variable (struct cpstack **, struct varobj *, int);
+static int delete_variable (struct varobj *, bool);
-static void delete_variable_1 (struct cpstack **, int *,
- struct varobj *, int, int);
+static void delete_variable_1 (int *, struct varobj *, bool, bool);
-static int install_variable (struct varobj *);
+static bool install_variable (struct varobj *);
static void uninstall_variable (struct varobj *);
-static struct varobj *create_child (struct varobj *, int, char *);
+static struct varobj *create_child (struct varobj *, int, std::string &);
-/* Utility routines */
-
-static struct varobj *new_variable (void);
-
-static struct varobj *new_root_variable (void);
-
-static void free_variable (struct varobj *var);
-
-static struct cleanup *make_cleanup_free_variable (struct varobj *var);
-
-static struct type *get_type (struct varobj *var);
-
-static struct type *get_value_type (struct varobj *var);
+static struct varobj *
+create_child_with_value (struct varobj *parent, int index,
+ struct varobj_item *item);
-static struct type *get_target_type (struct type *);
+/* Utility routines */
static enum varobj_display_formats variable_default_display (struct varobj *);
-static void cppush (struct cpstack **pstack, char *name);
-
-static char *cppop (struct cpstack **pstack);
-
-static int install_new_value (struct varobj *var, struct value *value,
- int initial);
-
-/* Language-specific routines. */
-
-static enum varobj_languages variable_language (struct varobj *var);
-
-static int number_of_children (struct varobj *);
-
-static char *name_of_variable (struct varobj *);
-
-static char *name_of_child (struct varobj *, int);
-
-static struct value *value_of_root (struct varobj **var_handle, int *);
-
-static struct value *value_of_child (struct varobj *parent, int index);
-
-static char *my_value_of_variable (struct varobj *var,
- enum varobj_display_formats format);
-
-static char *value_get_print_value (struct value *value,
- enum varobj_display_formats format);
-
-static int varobj_value_is_changeable_p (struct varobj *var);
-
-static int is_root_p (struct varobj *var);
-
-/* C implementation */
-
-static int c_number_of_children (struct varobj *var);
-
-static char *c_name_of_variable (struct varobj *parent);
-
-static char *c_name_of_child (struct varobj *parent, int index);
-
-static char *c_path_expr_of_child (struct varobj *child);
-
-static struct value *c_value_of_root (struct varobj **var_handle);
-
-static struct value *c_value_of_child (struct varobj *parent, int index);
-
-static struct type *c_type_of_child (struct varobj *parent, int index);
-
-static char *c_value_of_variable (struct varobj *var,
- enum varobj_display_formats format);
-
-/* C++ implementation */
-
-static int cplus_number_of_children (struct varobj *var);
-
-static void cplus_class_num_children (struct type *type, int children[3]);
-
-static char *cplus_name_of_variable (struct varobj *parent);
-
-static char *cplus_name_of_child (struct varobj *parent, int index);
-
-static char *cplus_path_expr_of_child (struct varobj *child);
-
-static struct value *cplus_value_of_root (struct varobj **var_handle);
-
-static struct value *cplus_value_of_child (struct varobj *parent, int index);
-
-static struct type *cplus_type_of_child (struct varobj *parent, int index);
+static bool update_type_if_necessary (struct varobj *var,
+ struct value *new_value);
-static char *cplus_value_of_variable (struct varobj *var,
- enum varobj_display_formats format);
+static bool install_new_value (struct varobj *var, struct value *value,
+ bool initial);
-/* Java implementation */
+/* Language-specific routines. */
-static int java_number_of_children (struct varobj *var);
+static int number_of_children (const struct varobj *);
-static char *java_name_of_variable (struct varobj *parent);
+static std::string name_of_variable (const struct varobj *);
-static char *java_name_of_child (struct varobj *parent, int index);
+static std::string name_of_child (struct varobj *, int);
-static char *java_path_expr_of_child (struct varobj *child);
+static struct value *value_of_root (struct varobj **var_handle, bool *);
-static struct value *java_value_of_root (struct varobj **var_handle);
+static struct value *value_of_child (const struct varobj *parent, int index);
-static struct value *java_value_of_child (struct varobj *parent, int index);
+static std::string my_value_of_variable (struct varobj *var,
+ enum varobj_display_formats format);
-static struct type *java_type_of_child (struct varobj *parent, int index);
+static bool is_root_p (const struct varobj *var);
-static char *java_value_of_variable (struct varobj *var,
- enum varobj_display_formats format);
-
-/* The language specific vector */
-
-struct language_specific
-{
-
- /* The language of this variable */
- enum varobj_languages language;
-
- /* The number of children of PARENT. */
- int (*number_of_children) (struct varobj * parent);
-
- /* The name (expression) of a root varobj. */
- char *(*name_of_variable) (struct varobj * parent);
-
- /* The name of the INDEX'th child of PARENT. */
- char *(*name_of_child) (struct varobj * parent, int index);
-
- /* Returns the rooted expression of CHILD, which is a variable
- obtain that has some parent. */
- char *(*path_expr_of_child) (struct varobj * child);
-
- /* The ``struct value *'' of the root variable ROOT. */
- struct value *(*value_of_root) (struct varobj ** root_handle);
-
- /* The ``struct value *'' of the INDEX'th child of PARENT. */
- struct value *(*value_of_child) (struct varobj * parent, int index);
-
- /* The type of the INDEX'th child of PARENT. */
- struct type *(*type_of_child) (struct varobj * parent, int index);
-
- /* The current value of VAR. */
- char *(*value_of_variable) (struct varobj * var,
- enum varobj_display_formats format);
-};
-
-/* Array of known source language routines. */
-static struct language_specific languages[vlang_end] = {
- /* Unknown (try treating as C */
- {
- vlang_unknown,
- c_number_of_children,
- c_name_of_variable,
- c_name_of_child,
- c_path_expr_of_child,
- c_value_of_root,
- c_value_of_child,
- c_type_of_child,
- c_value_of_variable}
- ,
- /* C */
- {
- vlang_c,
- c_number_of_children,
- c_name_of_variable,
- c_name_of_child,
- c_path_expr_of_child,
- c_value_of_root,
- c_value_of_child,
- c_type_of_child,
- c_value_of_variable}
- ,
- /* C++ */
- {
- vlang_cplus,
- cplus_number_of_children,
- cplus_name_of_variable,
- cplus_name_of_child,
- cplus_path_expr_of_child,
- cplus_value_of_root,
- cplus_value_of_child,
- cplus_type_of_child,
- cplus_value_of_variable}
- ,
- /* Java */
- {
- vlang_java,
- java_number_of_children,
- java_name_of_variable,
- java_name_of_child,
- java_path_expr_of_child,
- java_value_of_root,
- java_value_of_child,
- java_type_of_child,
- java_value_of_variable}
-};
-
-/* A little convenience enum for dealing with C++/Java */
-enum vsections
-{
- v_public = 0, v_private, v_protected
-};
+static struct varobj *varobj_add_child (struct varobj *var,
+ struct varobj_item *item);
/* Private data */
-/* Mappings of varobj_display_formats enums to gdb's format codes */
-static int format_code[] = { 0, 't', 'd', 'x', 'o' };
+/* Mappings of varobj_display_formats enums to gdb's format codes. */
+static int format_code[] = { 0, 't', 'd', 'x', 'o', 'z' };
-/* Header of the list of root variable objects */
+/* Header of the list of root variable objects. */
static struct varobj_root *rootlist;
-static int rootcount = 0; /* number of root varobjs in the list */
-/* Prime number indicating the number of buckets in the hash table */
-/* A prime large enough to avoid too many colisions */
+/* Prime number indicating the number of buckets in the hash table. */
+/* A prime large enough to avoid too many collisions. */
#define VAROBJ_TABLE_SIZE 227
-/* Pointer to the varobj hash table (built at run time) */
+/* Pointer to the varobj hash table (built at run time). */
static struct vlist **varobj_table;
-/* Is the variable X one of our "fake" children? */
-#define CPLUS_FAKE_CHILD(x) \
-((x) != NULL && (x)->type == NULL && (x)->value == NULL)
\f
/* API Implementation */
-static int
-is_root_p (struct varobj *var)
+static bool
+is_root_p (const struct varobj *var)
{
return (var->root->rootvar == var);
}
-/* Creates a varobj (not its children) */
+#ifdef HAVE_PYTHON
+
+/* See python-internal.h. */
+gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var)
+: gdbpy_enter (var->root->exp->gdbarch, var->root->exp->language_defn)
+{
+}
+
+#endif
/* Return the full FRAME which corresponds to the given CORE_ADDR
or NULL if no FRAME on the chain corresponds to CORE_ADDR. */
if (frame_addr == (CORE_ADDR) 0)
return NULL;
- while (1)
+ for (frame = get_current_frame ();
+ frame != NULL;
+ frame = get_prev_frame (frame))
{
- frame = get_prev_frame (frame);
- if (frame == NULL)
- return NULL;
- if (get_frame_base_address (frame) == frame_addr)
+ /* The CORE_ADDR we get as argument was parsed from a string GDB
+ output as $fp. This output got truncated to gdbarch_addr_bit.
+ Truncate the frame base address in the same manner before
+ comparing it against our argument. */
+ CORE_ADDR frame_base = get_frame_base_address (frame);
+ int addr_bit = gdbarch_addr_bit (get_frame_arch (frame));
+
+ if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
+ frame_base &= ((CORE_ADDR) 1 << addr_bit) - 1;
+
+ if (frame_base == frame_addr)
return frame;
}
+
+ return NULL;
}
+/* Creates a varobj (not its children). */
+
struct varobj *
-varobj_create (char *objname,
- char *expression, CORE_ADDR frame, enum varobj_type type)
+varobj_create (const char *objname,
+ const char *expression, CORE_ADDR frame, enum varobj_type type)
{
- struct varobj *var;
- struct frame_info *fi;
- struct frame_info *old_fi = NULL;
- struct block *block;
- struct cleanup *old_chain;
-
- /* Fill out a varobj structure for the (root) variable being constructed. */
- var = new_root_variable ();
- old_chain = make_cleanup_free_variable (var);
+ /* Fill out a varobj structure for the (root) variable being constructed. */
+ std::unique_ptr<varobj> var (new varobj (new varobj_root));
if (expression != NULL)
{
- char *p;
- enum varobj_languages lang;
+ struct frame_info *fi;
+ struct frame_id old_id = null_frame_id;
+ const struct block *block;
+ const char *p;
struct value *value = NULL;
- int expr_len;
+ CORE_ADDR pc;
- /* Parse and evaluate the expression, filling in as much
- of the variable's data as possible */
+ /* Parse and evaluate the expression, filling in as much of the
+ variable's data as possible. */
- /* Allow creator to specify context of variable */
- if ((type == USE_CURRENT_FRAME) || (type == USE_SELECTED_FRAME))
- fi = deprecated_safe_get_selected_frame ();
+ if (has_stack_frames ())
+ {
+ /* Allow creator to specify context of variable. */
+ if ((type == USE_CURRENT_FRAME) || (type == USE_SELECTED_FRAME))
+ fi = get_selected_frame (NULL);
+ else
+ /* FIXME: cagney/2002-11-23: This code should be doing a
+ lookup using the frame ID and not just the frame's
+ ``address''. This, of course, means an interface
+ change. However, with out that interface change ISAs,
+ such as the ia64 with its two stacks, won't work.
+ Similar goes for the case where there is a frameless
+ function. */
+ fi = find_frame_addr_in_frame_chain (frame);
+ }
else
- /* FIXME: cagney/2002-11-23: This code should be doing a
- lookup using the frame ID and not just the frame's
- ``address''. This, of course, means an interface change.
- However, with out that interface change ISAs, such as the
- ia64 with its two stacks, won't work. Similar goes for the
- case where there is a frameless function. */
- fi = find_frame_addr_in_frame_chain (frame);
-
- /* frame = -2 means always use selected frame */
+ fi = NULL;
+
if (type == USE_SELECTED_FRAME)
- var->root->floating = 1;
+ var->root->floating = true;
+ pc = 0;
block = NULL;
if (fi != NULL)
- block = get_frame_block (fi, 0);
+ {
+ block = get_frame_block (fi, 0);
+ pc = get_frame_pc (fi);
+ }
p = expression;
- innermost_block = NULL;
+
+ innermost_block_tracker tracker (INNERMOST_BLOCK_FOR_SYMBOLS
+ | INNERMOST_BLOCK_FOR_REGISTERS);
/* Wrap the call to parse expression, so we can
- return a sensible error. */
- if (!gdb_parse_exp_1 (&p, block, 0, &var->root->exp))
+ return a sensible error. */
+ try
+ {
+ var->root->exp = parse_exp_1 (&p, pc, block, 0, &tracker);
+ }
+
+ catch (const gdb_exception_error &except)
{
return NULL;
}
- /* Don't allow variables to be created for types. */
- if (var->root->exp->elts[0].opcode == OP_TYPE)
+ /* Don't allow variables to be created for types. */
+ if (var->root->exp->elts[0].opcode == OP_TYPE
+ || var->root->exp->elts[0].opcode == OP_TYPEOF
+ || var->root->exp->elts[0].opcode == OP_DECLTYPE)
{
- do_cleanups (old_chain);
fprintf_unfiltered (gdb_stderr, "Attempt to use a type name"
" as an expression.\n");
return NULL;
}
- var->format = variable_default_display (var);
- var->root->valid_block = innermost_block;
- expr_len = strlen (expression);
- var->name = savestring (expression, expr_len);
+ var->format = variable_default_display (var.get ());
+ var->root->valid_block =
+ var->root->floating ? NULL : tracker.block ();
+ var->name = expression;
/* For a root var, the name and the expr are the same. */
- var->path_expr = savestring (expression, expr_len);
+ var->path_expr = expression;
/* When the frame is different from the current frame,
we must select the appropriate frame before parsing
the expression, otherwise the value will not be current.
- Since select_frame is so benign, just call it for all cases. */
- if (innermost_block && fi != NULL)
+ Since select_frame is so benign, just call it for all cases. */
+ if (var->root->valid_block)
{
+ /* User could specify explicit FRAME-ADDR which was not found but
+ EXPRESSION is frame specific and we would not be able to evaluate
+ it correctly next time. With VALID_BLOCK set we must also set
+ FRAME and THREAD_ID. */
+ if (fi == NULL)
+ error (_("Failed to find the specified frame"));
+
var->root->frame = get_frame_id (fi);
- var->root->thread_id = pid_to_thread_id (inferior_ptid);
- old_fi = get_selected_frame (NULL);
+ var->root->thread_id = inferior_thread ()->global_num;
+ old_id = get_frame_id (get_selected_frame (NULL));
select_frame (fi);
}
/* We definitely need to catch errors here.
If evaluate_expression succeeds we got the value we wanted.
- But if it fails, we still go on with a call to evaluate_type() */
- if (!gdb_evaluate_expression (var->root->exp, &value))
+ But if it fails, we still go on with a call to evaluate_type(). */
+ try
+ {
+ value = evaluate_expression (var->root->exp.get ());
+ }
+ catch (const gdb_exception_error &except)
{
/* Error getting the value. Try to at least get the
right type. */
- struct value *type_only_value = evaluate_type (var->root->exp);
+ struct value *type_only_value = evaluate_type (var->root->exp.get ());
+
var->type = value_type (type_only_value);
}
- else
- var->type = value_type (value);
- install_new_value (var, value, 1 /* Initial assignment */);
+ if (value != NULL)
+ {
+ int real_type_found = 0;
+
+ var->type = value_actual_type (value, 0, &real_type_found);
+ if (real_type_found)
+ value = value_cast (var->type, value);
+ }
/* Set language info */
- lang = variable_language (var);
- var->root->lang = &languages[lang];
+ var->root->lang_ops = var->root->exp->language_defn->la_varobj_ops;
- /* Set ourselves as our root */
- var->root->rootvar = var;
+ install_new_value (var.get (), value, 1 /* Initial assignment */);
- /* Reset the selected frame */
- if (fi != NULL)
- select_frame (old_fi);
+ /* Set ourselves as our root. */
+ var->root->rootvar = var.get ();
+
+ /* Reset the selected frame. */
+ if (frame_id_p (old_id))
+ select_frame (frame_find_by_id (old_id));
}
/* If the variable object name is null, that means this
- is a temporary variable, so don't install it. */
+ is a temporary variable, so don't install it. */
if ((var != NULL) && (objname != NULL))
{
- var->obj_name = savestring (objname, strlen (objname));
+ var->obj_name = objname;
/* If a varobj name is duplicated, the install will fail so
- we must clenup */
- if (!install_variable (var))
- {
- do_cleanups (old_chain);
- return NULL;
- }
+ we must cleanup. */
+ if (!install_variable (var.get ()))
+ return NULL;
}
- discard_cleanups (old_chain);
- return var;
+ return var.release ();
}
-/* Generates an unique name that can be used for a varobj */
+/* Generates an unique name that can be used for a varobj. */
-char *
+std::string
varobj_gen_name (void)
{
static int id = 0;
- char *obj_name;
- /* generate a name for this object */
+ /* Generate a name for this object. */
id++;
- obj_name = xstrprintf ("var%d", id);
-
- return obj_name;
+ return string_printf ("var%d", id);
}
-/* Given an "objname", returns the pointer to the corresponding varobj
- or NULL if not found */
+/* Given an OBJNAME, returns the pointer to the corresponding varobj. Call
+ error if OBJNAME cannot be found. */
struct varobj *
-varobj_get_handle (char *objname)
+varobj_get_handle (const char *objname)
{
struct vlist *cv;
const char *chp;
}
cv = *(varobj_table + index);
- while ((cv != NULL) && (strcmp (cv->var->obj_name, objname) != 0))
+ while (cv != NULL && cv->var->obj_name != objname)
cv = cv->next;
if (cv == NULL)
return cv->var;
}
-/* Given the handle, return the name of the object */
+/* Given the handle, return the name of the object. */
-char *
-varobj_get_objname (struct varobj *var)
+const char *
+varobj_get_objname (const struct varobj *var)
{
- return var->obj_name;
+ return var->obj_name.c_str ();
}
-/* Given the handle, return the expression represented by the object */
+/* Given the handle, return the expression represented by the
+ object. */
-char *
-varobj_get_expression (struct varobj *var)
+std::string
+varobj_get_expression (const struct varobj *var)
{
return name_of_variable (var);
}
-/* Deletes a varobj and all its children if only_children == 0,
- otherwise deletes only the children; returns a malloc'ed list of all the
- (malloc'ed) names of the variables that have been deleted (NULL terminated) */
+/* See varobj.h. */
int
-varobj_delete (struct varobj *var, char ***dellist, int only_children)
+varobj_delete (struct varobj *var, bool only_children)
{
- int delcount;
- int mycount;
- struct cpstack *result = NULL;
- char **cp;
-
- /* Initialize a stack for temporary results */
- cppush (&result, NULL);
-
- if (only_children)
- /* Delete only the variable children */
- delcount = delete_variable (&result, var, 1 /* only the children */ );
- else
- /* Delete the variable and all its children */
- delcount = delete_variable (&result, var, 0 /* parent+children */ );
+ return delete_variable (var, only_children);
+}
- /* We may have been asked to return a list of what has been deleted */
- if (dellist != NULL)
- {
- *dellist = xmalloc ((delcount + 1) * sizeof (char *));
+#if HAVE_PYTHON
- cp = *dellist;
- mycount = delcount;
- *cp = cppop (&result);
- while ((*cp != NULL) && (mycount > 0))
- {
- mycount--;
- cp++;
- *cp = cppop (&result);
- }
+/* Convenience function for varobj_set_visualizer. Instantiate a
+ pretty-printer for a given value. */
+static PyObject *
+instantiate_pretty_printer (PyObject *constructor, struct value *value)
+{
+ PyObject *val_obj = NULL;
+ PyObject *printer;
- if (mycount || (*cp != NULL))
- warning (_("varobj_delete: assertion failed - mycount(=%d) <> 0"),
- mycount);
- }
+ val_obj = value_to_value_object (value);
+ if (! val_obj)
+ return NULL;
- return delcount;
+ printer = PyObject_CallFunctionObjArgs (constructor, val_obj, NULL);
+ Py_DECREF (val_obj);
+ return printer;
}
-/* Set/Get variable object display format */
+#endif
+
+/* Set/Get variable object display format. */
enum varobj_display_formats
varobj_set_display_format (struct varobj *var,
case FORMAT_DECIMAL:
case FORMAT_HEXADECIMAL:
case FORMAT_OCTAL:
+ case FORMAT_ZHEXADECIMAL:
var->format = format;
break;
}
if (varobj_value_is_changeable_p (var)
- && var->value && !value_lazy (var->value))
+ && var->value != nullptr && !value_lazy (var->value.get ()))
{
- free (var->print_value);
- var->print_value = value_get_print_value (var->value, var->format);
+ var->print_value = varobj_value_get_print_value (var->value.get (),
+ var->format, var);
}
return var->format;
}
enum varobj_display_formats
-varobj_get_display_format (struct varobj *var)
+varobj_get_display_format (const struct varobj *var)
{
return var->format;
}
+gdb::unique_xmalloc_ptr<char>
+varobj_get_display_hint (const struct varobj *var)
+{
+ gdb::unique_xmalloc_ptr<char> result;
+
+#if HAVE_PYTHON
+ if (!gdb_python_initialized)
+ return NULL;
+
+ gdbpy_enter_varobj enter_py (var);
+
+ if (var->dynamic->pretty_printer != NULL)
+ result = gdbpy_get_display_hint (var->dynamic->pretty_printer);
+#endif
+
+ return result;
+}
+
+/* Return true if the varobj has items after TO, false otherwise. */
+
+bool
+varobj_has_more (const struct varobj *var, int to)
+{
+ if (var->children.size () > to)
+ return true;
+
+ return ((to == -1 || var->children.size () == to)
+ && (var->dynamic->saved_item != NULL));
+}
+
/* If the variable object is bound to a specific thread, that
is its evaluation can always be done in context of a frame
inside that thread, returns GDB id of the thread -- which
- is always positive. Otherwise, returns -1. */
+ is always positive. Otherwise, returns -1. */
int
-varobj_get_thread_id (struct varobj *var)
+varobj_get_thread_id (const struct varobj *var)
{
if (var->root->valid_block && var->root->thread_id > 0)
return var->root->thread_id;
}
void
-varobj_set_frozen (struct varobj *var, int frozen)
+varobj_set_frozen (struct varobj *var, bool frozen)
{
/* When a variable is unfrozen, we don't fetch its value.
The 'not_fetched' flag remains set, so next -var-update
var->frozen = frozen;
}
-int
-varobj_get_frozen (struct varobj *var)
+bool
+varobj_get_frozen (const struct varobj *var)
{
return var->frozen;
}
+/* A helper function that updates the contents of FROM and TO based on the
+ size of the vector CHILDREN. If the contents of either FROM or TO are
+ negative the entire range is used. */
-int
-varobj_get_num_children (struct varobj *var)
+void
+varobj_restrict_range (const std::vector<varobj *> &children,
+ int *from, int *to)
{
- if (var->num_children == -1)
- var->num_children = number_of_children (var);
+ int len = children.size ();
- return var->num_children;
+ if (*from < 0 || *to < 0)
+ {
+ *from = 0;
+ *to = len;
+ }
+ else
+ {
+ if (*from > len)
+ *from = len;
+ if (*to > len)
+ *to = len;
+ if (*from > *to)
+ *from = *to;
+ }
}
-/* Creates a list of the immediate children of a variable object;
- the return code is the number of such children or -1 on error */
-
-VEC (varobj_p)*
-varobj_list_children (struct varobj *var)
-{
- struct varobj *child;
- char *name;
- int i;
-
- if (var->num_children == -1)
- var->num_children = number_of_children (var);
-
- /* If that failed, give up. */
- if (var->num_children == -1)
- return var->children;
-
- /* If we're called when the list of children is not yet initialized,
- allocate enough elements in it. */
- while (VEC_length (varobj_p, var->children) < var->num_children)
- VEC_safe_push (varobj_p, var->children, NULL);
+/* A helper for update_dynamic_varobj_children that installs a new
+ child when needed. */
- for (i = 0; i < var->num_children; i++)
+static void
+install_dynamic_child (struct varobj *var,
+ std::vector<varobj *> *changed,
+ std::vector<varobj *> *type_changed,
+ std::vector<varobj *> *newobj,
+ std::vector<varobj *> *unchanged,
+ bool *cchanged,
+ int index,
+ struct varobj_item *item)
+{
+ if (var->children.size () < index + 1)
{
- varobj_p existing = VEC_index (varobj_p, var->children, i);
+ /* There's no child yet. */
+ struct varobj *child = varobj_add_child (var, item);
- if (existing == NULL)
+ if (newobj != NULL)
{
- /* Either it's the first call to varobj_list_children for
- this variable object, and the child was never created,
- or it was explicitly deleted by the client. */
- name = name_of_child (var, i);
- existing = create_child (var, i, name);
- VEC_replace (varobj_p, var->children, i, existing);
+ newobj->push_back (child);
+ *cchanged = true;
}
}
+ else
+ {
+ varobj *existing = var->children[index];
+ bool type_updated = update_type_if_necessary (existing, item->value);
- return var->children;
+ if (type_updated)
+ {
+ if (type_changed != NULL)
+ type_changed->push_back (existing);
+ }
+ if (install_new_value (existing, item->value, 0))
+ {
+ if (!type_updated && changed != NULL)
+ changed->push_back (existing);
+ }
+ else if (!type_updated && unchanged != NULL)
+ unchanged->push_back (existing);
+ }
}
-/* Obtain the type of an object Variable as a string similar to the one gdb
- prints on the console */
+#if HAVE_PYTHON
-char *
-varobj_get_type (struct varobj *var)
+static bool
+dynamic_varobj_has_child_method (const struct varobj *var)
{
- struct value *val;
- struct cleanup *old_chain;
- struct ui_file *stb;
- char *thetype;
- long length;
-
- /* For the "fake" variables, do not return a type. (It's type is
- NULL, too.)
- Do not return a type for invalid variables as well. */
- if (CPLUS_FAKE_CHILD (var) || !var->root->is_valid)
- return NULL;
-
- stb = mem_fileopen ();
- old_chain = make_cleanup_ui_file_delete (stb);
+ PyObject *printer = var->dynamic->pretty_printer;
- /* To print the type, we simply create a zero ``struct value *'' and
- cast it to our type. We then typeprint this variable. */
- val = value_zero (var->type, not_lval);
- type_print (value_type (val), "", stb, -1);
+ if (!gdb_python_initialized)
+ return false;
- thetype = ui_file_xstrdup (stb, &length);
- do_cleanups (old_chain);
- return thetype;
+ gdbpy_enter_varobj enter_py (var);
+ return PyObject_HasAttr (printer, gdbpy_children_cst);
}
+#endif
-/* Obtain the type of an object variable. */
+/* A factory for creating dynamic varobj's iterators. Returns an
+ iterator object suitable for iterating over VAR's children. */
-struct type *
-varobj_get_gdb_type (struct varobj *var)
+static struct varobj_iter *
+varobj_get_iterator (struct varobj *var)
{
- return var->type;
+#if HAVE_PYTHON
+ if (var->dynamic->pretty_printer)
+ return py_varobj_get_iterator (var, var->dynamic->pretty_printer);
+#endif
+
+ gdb_assert_not_reached (_("\
+requested an iterator from a non-dynamic varobj"));
}
-/* Return a pointer to the full rooted expression of varobj VAR.
- If it has not been computed yet, compute it. */
-char *
-varobj_get_path_expr (struct varobj *var)
+/* Release and clear VAR's saved item, if any. */
+
+static void
+varobj_clear_saved_item (struct varobj_dynamic *var)
{
- if (var->path_expr != NULL)
- return var->path_expr;
- else
+ if (var->saved_item != NULL)
{
- /* For root varobjs, we initialize path_expr
- when creating varobj, so here it should be
- child varobj. */
- gdb_assert (!is_root_p (var));
- return (*var->root->lang->path_expr_of_child) (var);
+ value_decref (var->saved_item->value);
+ delete var->saved_item;
+ var->saved_item = NULL;
}
}
-enum varobj_languages
-varobj_get_language (struct varobj *var)
+static bool
+update_dynamic_varobj_children (struct varobj *var,
+ std::vector<varobj *> *changed,
+ std::vector<varobj *> *type_changed,
+ std::vector<varobj *> *newobj,
+ std::vector<varobj *> *unchanged,
+ bool *cchanged,
+ bool update_children,
+ int from,
+ int to)
{
- return variable_language (var);
-}
+ int i;
-int
-varobj_get_attributes (struct varobj *var)
-{
- int attributes = 0;
+ *cchanged = false;
- if (varobj_editable_p (var))
- /* FIXME: define masks for attributes */
- attributes |= 0x00000001; /* Editable */
+ if (update_children || var->dynamic->child_iter == NULL)
+ {
+ varobj_iter_delete (var->dynamic->child_iter);
+ var->dynamic->child_iter = varobj_get_iterator (var);
- return attributes;
-}
+ varobj_clear_saved_item (var->dynamic);
-char *
-varobj_get_formatted_value (struct varobj *var,
- enum varobj_display_formats format)
-{
- return my_value_of_variable (var, format);
-}
+ i = 0;
-char *
-varobj_get_value (struct varobj *var)
-{
- return my_value_of_variable (var, var->format);
-}
+ if (var->dynamic->child_iter == NULL)
+ return false;
+ }
+ else
+ i = var->children.size ();
-/* Set the value of an object variable (if it is editable) to the
- value of the given expression */
-/* Note: Invokes functions that can call error() */
+ /* We ask for one extra child, so that MI can report whether there
+ are more children. */
+ for (; to < 0 || i < to + 1; ++i)
+ {
+ varobj_item *item;
-int
-varobj_set_value (struct varobj *var, char *expression)
-{
- struct value *val;
- int offset = 0;
- int error = 0;
+ /* See if there was a leftover from last time. */
+ if (var->dynamic->saved_item != NULL)
+ {
+ item = var->dynamic->saved_item;
+ var->dynamic->saved_item = NULL;
+ }
+ else
+ {
+ item = varobj_iter_next (var->dynamic->child_iter);
+ /* Release vitem->value so its lifetime is not bound to the
+ execution of a command. */
+ if (item != NULL && item->value != NULL)
+ item->value = release_value (item->value).release ();
+ }
- /* The argument "expression" contains the variable's new value.
- We need to first construct a legal expression for this -- ugh! */
- /* Does this cover all the bases? */
- struct expression *exp;
- struct value *value;
- int saved_input_radix = input_radix;
- char *s = expression;
- int i;
+ if (item == NULL)
+ {
+ /* Iteration is done. Remove iterator from VAR. */
+ varobj_iter_delete (var->dynamic->child_iter);
+ var->dynamic->child_iter = NULL;
+ break;
+ }
+ /* We don't want to push the extra child on any report list. */
+ if (to < 0 || i < to)
+ {
+ bool can_mention = from < 0 || i >= from;
- gdb_assert (varobj_editable_p (var));
+ install_dynamic_child (var, can_mention ? changed : NULL,
+ can_mention ? type_changed : NULL,
+ can_mention ? newobj : NULL,
+ can_mention ? unchanged : NULL,
+ can_mention ? cchanged : NULL, i,
+ item);
+
+ delete item;
+ }
+ else
+ {
+ var->dynamic->saved_item = item;
+
+ /* We want to truncate the child list just before this
+ element. */
+ break;
+ }
+ }
- input_radix = 10; /* ALWAYS reset to decimal temporarily */
- exp = parse_exp_1 (&s, 0, 0);
- if (!gdb_evaluate_expression (exp, &value))
+ if (i < var->children.size ())
{
- /* We cannot proceed without a valid expression. */
- xfree (exp);
- return 0;
+ *cchanged = true;
+ for (int j = i; j < var->children.size (); ++j)
+ varobj_delete (var->children[j], 0);
+
+ var->children.resize (i);
}
- /* All types that are editable must also be changeable. */
- gdb_assert (varobj_value_is_changeable_p (var));
+ /* If there are fewer children than requested, note that the list of
+ children changed. */
+ if (to >= 0 && var->children.size () < to)
+ *cchanged = true;
+
+ var->num_children = var->children.size ();
+
+ return true;
+}
+
+int
+varobj_get_num_children (struct varobj *var)
+{
+ if (var->num_children == -1)
+ {
+ if (varobj_is_dynamic_p (var))
+ {
+ bool dummy;
+
+ /* If we have a dynamic varobj, don't report -1 children.
+ So, try to fetch some children first. */
+ update_dynamic_varobj_children (var, NULL, NULL, NULL, NULL, &dummy,
+ false, 0, 0);
+ }
+ else
+ var->num_children = number_of_children (var);
+ }
+
+ return var->num_children >= 0 ? var->num_children : 0;
+}
+
+/* Creates a list of the immediate children of a variable object;
+ the return code is the number of such children or -1 on error. */
+
+const std::vector<varobj *> &
+varobj_list_children (struct varobj *var, int *from, int *to)
+{
+ var->dynamic->children_requested = true;
+
+ if (varobj_is_dynamic_p (var))
+ {
+ bool children_changed;
+
+ /* This, in theory, can result in the number of children changing without
+ frontend noticing. But well, calling -var-list-children on the same
+ varobj twice is not something a sane frontend would do. */
+ update_dynamic_varobj_children (var, NULL, NULL, NULL, NULL,
+ &children_changed, false, 0, *to);
+ varobj_restrict_range (var->children, from, to);
+ return var->children;
+ }
+
+ if (var->num_children == -1)
+ var->num_children = number_of_children (var);
+
+ /* If that failed, give up. */
+ if (var->num_children == -1)
+ return var->children;
+
+ /* If we're called when the list of children is not yet initialized,
+ allocate enough elements in it. */
+ while (var->children.size () < var->num_children)
+ var->children.push_back (NULL);
+
+ for (int i = 0; i < var->num_children; i++)
+ {
+ if (var->children[i] == NULL)
+ {
+ /* Either it's the first call to varobj_list_children for
+ this variable object, and the child was never created,
+ or it was explicitly deleted by the client. */
+ std::string name = name_of_child (var, i);
+ var->children[i] = create_child (var, i, name);
+ }
+ }
+
+ varobj_restrict_range (var->children, from, to);
+ return var->children;
+}
+
+static struct varobj *
+varobj_add_child (struct varobj *var, struct varobj_item *item)
+{
+ varobj *v = create_child_with_value (var, var->children.size (), item);
+
+ var->children.push_back (v);
+
+ return v;
+}
+
+/* Obtain the type of an object Variable as a string similar to the one gdb
+ prints on the console. The caller is responsible for freeing the string.
+ */
+
+std::string
+varobj_get_type (struct varobj *var)
+{
+ /* For the "fake" variables, do not return a type. (Its type is
+ NULL, too.)
+ Do not return a type for invalid variables as well. */
+ if (CPLUS_FAKE_CHILD (var) || !var->root->is_valid)
+ return std::string ();
+
+ return type_to_string (var->type);
+}
+
+/* Obtain the type of an object variable. */
+
+struct type *
+varobj_get_gdb_type (const struct varobj *var)
+{
+ return var->type;
+}
+
+/* Is VAR a path expression parent, i.e., can it be used to construct
+ a valid path expression? */
+
+static bool
+is_path_expr_parent (const struct varobj *var)
+{
+ gdb_assert (var->root->lang_ops->is_path_expr_parent != NULL);
+ return var->root->lang_ops->is_path_expr_parent (var);
+}
+
+/* Is VAR a path expression parent, i.e., can it be used to construct
+ a valid path expression? By default we assume any VAR can be a path
+ parent. */
+
+bool
+varobj_default_is_path_expr_parent (const struct varobj *var)
+{
+ return true;
+}
+
+/* Return the path expression parent for VAR. */
+
+const struct varobj *
+varobj_get_path_expr_parent (const struct varobj *var)
+{
+ const struct varobj *parent = var;
+
+ while (!is_root_p (parent) && !is_path_expr_parent (parent))
+ parent = parent->parent;
+
+ /* Computation of full rooted expression for children of dynamic
+ varobjs is not supported. */
+ if (varobj_is_dynamic_p (parent))
+ error (_("Invalid variable object (child of a dynamic varobj)"));
+
+ return parent;
+}
+
+/* Return a pointer to the full rooted expression of varobj VAR.
+ If it has not been computed yet, compute it. */
+
+const char *
+varobj_get_path_expr (const struct varobj *var)
+{
+ if (var->path_expr.empty ())
+ {
+ /* For root varobjs, we initialize path_expr
+ when creating varobj, so here it should be
+ child varobj. */
+ struct varobj *mutable_var = (struct varobj *) var;
+ gdb_assert (!is_root_p (var));
+
+ mutable_var->path_expr = (*var->root->lang_ops->path_expr_of_child) (var);
+ }
+
+ return var->path_expr.c_str ();
+}
+
+const struct language_defn *
+varobj_get_language (const struct varobj *var)
+{
+ return var->root->exp->language_defn;
+}
+
+int
+varobj_get_attributes (const struct varobj *var)
+{
+ int attributes = 0;
+
+ if (varobj_editable_p (var))
+ /* FIXME: define masks for attributes. */
+ attributes |= 0x00000001; /* Editable */
+
+ return attributes;
+}
+
+/* Return true if VAR is a dynamic varobj. */
+
+bool
+varobj_is_dynamic_p (const struct varobj *var)
+{
+ return var->dynamic->pretty_printer != NULL;
+}
+
+std::string
+varobj_get_formatted_value (struct varobj *var,
+ enum varobj_display_formats format)
+{
+ return my_value_of_variable (var, format);
+}
+
+std::string
+varobj_get_value (struct varobj *var)
+{
+ return my_value_of_variable (var, var->format);
+}
+
+/* Set the value of an object variable (if it is editable) to the
+ value of the given expression. */
+/* Note: Invokes functions that can call error(). */
+
+bool
+varobj_set_value (struct varobj *var, const char *expression)
+{
+ struct value *val = NULL; /* Initialize to keep gcc happy. */
+ /* The argument "expression" contains the variable's new value.
+ We need to first construct a legal expression for this -- ugh! */
+ /* Does this cover all the bases? */
+ struct value *value = NULL; /* Initialize to keep gcc happy. */
+ int saved_input_radix = input_radix;
+ const char *s = expression;
+
+ gdb_assert (varobj_editable_p (var));
+
+ input_radix = 10; /* ALWAYS reset to decimal temporarily. */
+ expression_up exp = parse_exp_1 (&s, 0, 0, 0);
+ try
+ {
+ value = evaluate_expression (exp.get ());
+ }
+
+ catch (const gdb_exception_error &except)
+ {
+ /* We cannot proceed without a valid expression. */
+ return false;
+ }
+
+ /* All types that are editable must also be changeable. */
+ gdb_assert (varobj_value_is_changeable_p (var));
/* The value of a changeable variable object must not be lazy. */
- gdb_assert (!value_lazy (var->value));
+ gdb_assert (!value_lazy (var->value.get ()));
/* Need to coerce the input. We want to check if the
value of the variable object will be different
after assignment, and the first thing value_assign
does is coerce the input.
For example, if we are assigning an array to a pointer variable we
- should compare the pointer with the the array's address, not with the
+ should compare the pointer with the array's address, not with the
array's content. */
value = coerce_array (value);
- /* The new value may be lazy. gdb_value_assign, or
- rather value_contents, will take care of this.
- If fetching of the new value will fail, gdb_value_assign
- with catch the exception. */
- if (!gdb_value_assign (var->value, value, &val))
- return 0;
-
+ /* The new value may be lazy. value_assign, or
+ rather value_contents, will take care of this. */
+ try
+ {
+ val = value_assign (var->value.get (), value);
+ }
+
+ catch (const gdb_exception_error &except)
+ {
+ return false;
+ }
+
/* If the value has changed, record it, so that next -var-update can
report this change. If a variable had a value of '1', we've set it
to '333' and then set again to '1', when -var-update will report this
variable as changed -- because the first assignment has set the
'updated' flag. There's no need to optimize that, because return value
of -var-update should be considered an approximation. */
- var->updated = install_new_value (var, val, 0 /* Compare values. */);
+ var->updated = install_new_value (var, val, false /* Compare values. */);
input_radix = saved_input_radix;
- return 1;
+ return true;
}
-/* Returns a malloc'ed list with all root variable objects */
-int
-varobj_list (struct varobj ***varlist)
+#if HAVE_PYTHON
+
+/* A helper function to install a constructor function and visualizer
+ in a varobj_dynamic. */
+
+static void
+install_visualizer (struct varobj_dynamic *var, PyObject *constructor,
+ PyObject *visualizer)
+{
+ Py_XDECREF (var->constructor);
+ var->constructor = constructor;
+
+ Py_XDECREF (var->pretty_printer);
+ var->pretty_printer = visualizer;
+
+ varobj_iter_delete (var->child_iter);
+ var->child_iter = NULL;
+}
+
+/* Install the default visualizer for VAR. */
+
+static void
+install_default_visualizer (struct varobj *var)
+{
+ /* Do not install a visualizer on a CPLUS_FAKE_CHILD. */
+ if (CPLUS_FAKE_CHILD (var))
+ return;
+
+ if (pretty_printing)
+ {
+ gdbpy_ref<> pretty_printer;
+
+ if (var->value != nullptr)
+ {
+ pretty_printer = gdbpy_get_varobj_pretty_printer (var->value.get ());
+ if (pretty_printer == nullptr)
+ {
+ gdbpy_print_stack ();
+ error (_("Cannot instantiate printer for default visualizer"));
+ }
+ }
+
+ if (pretty_printer == Py_None)
+ pretty_printer.reset (nullptr);
+
+ install_visualizer (var->dynamic, NULL, pretty_printer.release ());
+ }
+}
+
+/* Instantiate and install a visualizer for VAR using CONSTRUCTOR to
+ make a new object. */
+
+static void
+construct_visualizer (struct varobj *var, PyObject *constructor)
{
- struct varobj **cv;
- struct varobj_root *croot;
- int mycount = rootcount;
+ PyObject *pretty_printer;
+
+ /* Do not install a visualizer on a CPLUS_FAKE_CHILD. */
+ if (CPLUS_FAKE_CHILD (var))
+ return;
+
+ Py_INCREF (constructor);
+ if (constructor == Py_None)
+ pretty_printer = NULL;
+ else
+ {
+ pretty_printer = instantiate_pretty_printer (constructor,
+ var->value.get ());
+ if (! pretty_printer)
+ {
+ gdbpy_print_stack ();
+ Py_DECREF (constructor);
+ constructor = Py_None;
+ Py_INCREF (constructor);
+ }
+
+ if (pretty_printer == Py_None)
+ {
+ Py_DECREF (pretty_printer);
+ pretty_printer = NULL;
+ }
+ }
+
+ install_visualizer (var->dynamic, constructor, pretty_printer);
+}
+
+#endif /* HAVE_PYTHON */
+
+/* A helper function for install_new_value. This creates and installs
+ a visualizer for VAR, if appropriate. */
- /* Alloc (rootcount + 1) entries for the result */
- *varlist = xmalloc ((rootcount + 1) * sizeof (struct varobj *));
+static void
+install_new_value_visualizer (struct varobj *var)
+{
+#if HAVE_PYTHON
+ /* If the constructor is None, then we want the raw value. If VAR
+ does not have a value, just skip this. */
+ if (!gdb_python_initialized)
+ return;
- cv = *varlist;
- croot = rootlist;
- while ((croot != NULL) && (mycount > 0))
+ if (var->dynamic->constructor != Py_None && var->value != NULL)
{
- *cv = croot->rootvar;
- mycount--;
- cv++;
- croot = croot->next;
+ gdbpy_enter_varobj enter_py (var);
+
+ if (var->dynamic->constructor == NULL)
+ install_default_visualizer (var);
+ else
+ construct_visualizer (var, var->dynamic->constructor);
}
- /* Mark the end of the list */
- *cv = NULL;
+#else
+ /* Do nothing. */
+#endif
+}
+
+/* When using RTTI to determine variable type it may be changed in runtime when
+ the variable value is changed. This function checks whether type of varobj
+ VAR will change when a new value NEW_VALUE is assigned and if it is so
+ updates the type of VAR. */
+
+static bool
+update_type_if_necessary (struct varobj *var, struct value *new_value)
+{
+ if (new_value)
+ {
+ struct value_print_options opts;
+
+ get_user_print_options (&opts);
+ if (opts.objectprint)
+ {
+ struct type *new_type = value_actual_type (new_value, 0, 0);
+ std::string new_type_str = type_to_string (new_type);
+ std::string curr_type_str = varobj_get_type (var);
- if (mycount || (croot != NULL))
- warning
- ("varobj_list: assertion failed - wrong tally of root vars (%d:%d)",
- rootcount, mycount);
+ /* Did the type name change? */
+ if (curr_type_str != new_type_str)
+ {
+ var->type = new_type;
+
+ /* This information may be not valid for a new type. */
+ varobj_delete (var, 1);
+ var->children.clear ();
+ var->num_children = -1;
+ return true;
+ }
+ }
+ }
- return rootcount;
+ return false;
}
-/* Assign a new value to a variable object. If INITIAL is non-zero,
- this is the first assignement after the variable object was just
+/* Assign a new value to a variable object. If INITIAL is true,
+ this is the first assignment after the variable object was just
created, or changed type. In that case, just assign the value
- and return 0.
- Otherwise, assign the value and if type_changeable returns non-zero,
- find if the new value is different from the current value.
- Return 1 if so, and 0 if the values are equal.
+ and return false.
+ Otherwise, assign the new value, and return true if the value is
+ different from the current one, false otherwise. The comparison is
+ done on textual representation of value. Therefore, some types
+ need not be compared. E.g. for structures the reported value is
+ always "{...}", so no comparison is necessary here. If the old
+ value was NULL and new one is not, or vice versa, we always return true.
The VALUE parameter should not be released -- the function will
take care of releasing it when needed. */
-static int
-install_new_value (struct varobj *var, struct value *value, int initial)
+static bool
+install_new_value (struct varobj *var, struct value *value, bool initial)
{
- int changeable;
- int need_to_fetch;
- int changed = 0;
- int intentionally_not_fetched = 0;
- char *print_value = NULL;
+ bool changeable;
+ bool need_to_fetch;
+ bool changed = false;
+ bool intentionally_not_fetched = false;
/* We need to know the varobj's type to decide if the value should
- be fetched or not. C++ fake children (public/protected/private) don't have
- a type. */
+ be fetched or not. C++ fake children (public/protected/private)
+ don't have a type. */
gdb_assert (var->type || CPLUS_FAKE_CHILD (var));
changeable = varobj_value_is_changeable_p (var);
+
+ /* If the type has custom visualizer, we consider it to be always
+ changeable. FIXME: need to make sure this behaviour will not
+ mess up read-sensitive values. */
+ if (var->dynamic->pretty_printer != NULL)
+ changeable = true;
+
need_to_fetch = changeable;
/* We are not interested in the address of references, and given
that in C++ a reference is not rebindable, it cannot
meaningfully change. So, get hold of the real value. */
if (value)
- {
- value = coerce_ref (value);
- release_value (value);
- }
+ value = coerce_ref (value);
if (var->type && TYPE_CODE (var->type) == TYPE_CODE_UNION)
/* For unions, we need to fetch the value implicitly because
the data from memory. For unions, that means we'll read the
same memory more than once, which is not desirable. So
fetch now. */
- need_to_fetch = 1;
+ need_to_fetch = true;
/* The new value might be lazy. If the type is changeable,
that is we'll be comparing values of this type, fetch the
will be lazy, which means we've lost that old value. */
if (need_to_fetch && value && value_lazy (value))
{
- struct varobj *parent = var->parent;
- int frozen = var->frozen;
+ const struct varobj *parent = var->parent;
+ bool frozen = var->frozen;
+
for (; !frozen && parent; parent = parent->parent)
frozen |= parent->frozen;
{
/* For variables that are frozen, or are children of frozen
variables, we don't do fetch on initial assignment.
- For non-initial assignemnt we do the fetch, since it means we're
+ For non-initial assignment we do the fetch, since it means we're
explicitly asked to compare the new value with the old one. */
- intentionally_not_fetched = 1;
+ intentionally_not_fetched = true;
}
- else if (!gdb_value_fetch_lazy (value))
+ else
{
- /* Set the value to NULL, so that for the next -var-update,
- we don't try to compare the new value with this value,
- that we couldn't even read. */
- value = NULL;
+
+ try
+ {
+ value_fetch_lazy (value);
+ }
+
+ catch (const gdb_exception_error &except)
+ {
+ /* Set the value to NULL, so that for the next -var-update,
+ we don't try to compare the new value with this value,
+ that we couldn't even read. */
+ value = NULL;
+ }
}
}
+ /* Get a reference now, before possibly passing it to any Python
+ code that might release it. */
+ value_ref_ptr value_holder;
+ if (value != NULL)
+ value_holder = value_ref_ptr::new_reference (value);
+
/* Below, we'll be comparing string rendering of old and new
values. Don't get string rendering if the value is
lazy -- if it is, the code above has decided that the value
should not be fetched. */
- if (value && !value_lazy (value))
- print_value = value_get_print_value (value, var->format);
+ std::string print_value;
+ if (value != NULL && !value_lazy (value)
+ && var->dynamic->pretty_printer == NULL)
+ print_value = varobj_value_get_print_value (value, var->format, var);
/* If the type is changeable, compare the old and the new values.
If this is the initial assignment, we don't have any old value
to compare with. */
if (!initial && changeable)
{
- /* If the value of the varobj was changed by -var-set-value, then the
- value in the varobj and in the target is the same. However, that value
- is different from the value that the varobj had after the previous
- -var-update. So need to the varobj as changed. */
+ /* If the value of the varobj was changed by -var-set-value,
+ then the value in the varobj and in the target is the same.
+ However, that value is different from the value that the
+ varobj had after the previous -var-update. So need to the
+ varobj as changed. */
if (var->updated)
- {
- changed = 1;
- }
- else
+ changed = true;
+ else if (var->dynamic->pretty_printer == NULL)
{
/* Try to compare the values. That requires that both
values are non-lazy. */
- if (var->not_fetched && value_lazy (var->value))
+ if (var->not_fetched && value_lazy (var->value.get ()))
{
/* This is a frozen varobj and the value was never read.
Presumably, UI shows some "never read" indicator.
Now that we've fetched the real value, we need to report
this varobj as changed so that UI can show the real
value. */
- changed = 1;
+ changed = true;
}
else if (var->value == NULL && value == NULL)
- /* Equal. */
+ /* Equal. */
;
else if (var->value == NULL || value == NULL)
{
- changed = 1;
+ changed = true;
}
else
{
- gdb_assert (!value_lazy (var->value));
+ gdb_assert (!value_lazy (var->value.get ()));
gdb_assert (!value_lazy (value));
- gdb_assert (var->print_value != NULL && print_value != NULL);
- if (strcmp (var->print_value, print_value) != 0)
- changed = 1;
+ gdb_assert (!var->print_value.empty () && !print_value.empty ());
+ if (var->print_value != print_value)
+ changed = true;
}
}
}
+ if (!initial && !changeable)
+ {
+ /* For values that are not changeable, we don't compare the values.
+ However, we want to notice if a value was not NULL and now is NULL,
+ or vise versa, so that we report when top-level varobjs come in scope
+ and leave the scope. */
+ changed = (var->value != NULL) != (value != NULL);
+ }
+
/* We must always keep the new value, since children depend on it. */
- if (var->value != NULL && var->value != value)
- value_free (var->value);
- var->value = value;
- if (var->print_value)
- xfree (var->print_value);
- var->print_value = print_value;
+ var->value = value_holder;
if (value && value_lazy (value) && intentionally_not_fetched)
- var->not_fetched = 1;
+ var->not_fetched = true;
else
- var->not_fetched = 0;
- var->updated = 0;
+ var->not_fetched = false;
+ var->updated = false;
+
+ install_new_value_visualizer (var);
+
+ /* If we installed a pretty-printer, re-compare the printed version
+ to see if the variable changed. */
+ if (var->dynamic->pretty_printer != NULL)
+ {
+ print_value = varobj_value_get_print_value (var->value.get (),
+ var->format, var);
+ if ((var->print_value.empty () && !print_value.empty ())
+ || (!var->print_value.empty () && print_value.empty ())
+ || (!var->print_value.empty () && !print_value.empty ()
+ && var->print_value != print_value))
+ changed = true;
+ }
+ var->print_value = print_value;
- gdb_assert (!var->value || value_type (var->value));
+ gdb_assert (var->value == nullptr || value_type (var->value.get ()));
return changed;
}
-/* Update the values for a variable and its children. This is a
- two-pronged attack. First, re-parse the value for the root's
- expression to see if it's changed. Then go all the way
- through its children, reconstructing them and noting if they've
- changed.
-
- The EXPLICIT parameter specifies if this call is result
- of MI request to update this specific variable, or
- result of implicit -var-update *. For implicit request, we don't
- update frozen variables.
+/* Return the requested range for a varobj. VAR is the varobj. FROM
+ and TO are out parameters; *FROM and *TO will be set to the
+ selected sub-range of VAR. If no range was selected using
+ -var-set-update-range, then both will be -1. */
+void
+varobj_get_child_range (const struct varobj *var, int *from, int *to)
+{
+ *from = var->from;
+ *to = var->to;
+}
- NOTE: This function may delete the caller's varobj. If it
- returns TYPE_CHANGED, then it has done this and VARP will be modified
- to point to the new varobj. */
+/* Set the selected sub-range of children of VAR to start at index
+ FROM and end at index TO. If either FROM or TO is less than zero,
+ this is interpreted as a request for all children. */
+void
+varobj_set_child_range (struct varobj *var, int from, int to)
+{
+ var->from = from;
+ var->to = to;
+}
-VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+void
+varobj_set_visualizer (struct varobj *var, const char *visualizer)
{
- int changed = 0;
- int type_changed = 0;
- int i;
- int vleft;
- struct varobj *v;
- struct varobj **cv;
- struct varobj **templist = NULL;
- struct value *new;
- VEC (varobj_p) *stack = NULL;
- VEC (varobj_update_result) *result = NULL;
- struct frame_info *fi;
+#if HAVE_PYTHON
+ PyObject *mainmod;
- /* Frozen means frozen -- we don't check for any change in
- this varobj, including its going out of scope, or
+ if (!gdb_python_initialized)
+ return;
+
+ gdbpy_enter_varobj enter_py (var);
+
+ mainmod = PyImport_AddModule ("__main__");
+ gdbpy_ref<> globals
+ = gdbpy_ref<>::new_reference (PyModule_GetDict (mainmod));
+ gdbpy_ref<> constructor (PyRun_String (visualizer, Py_eval_input,
+ globals.get (), globals.get ()));
+
+ if (constructor == NULL)
+ {
+ gdbpy_print_stack ();
+ error (_("Could not evaluate visualizer expression: %s"), visualizer);
+ }
+
+ construct_visualizer (var, constructor.get ());
+
+ /* If there are any children now, wipe them. */
+ varobj_delete (var, 1 /* children only */);
+ var->num_children = -1;
+#else
+ error (_("Python support required"));
+#endif
+}
+
+/* If NEW_VALUE is the new value of the given varobj (var), return
+ true if var has mutated. In other words, if the type of
+ the new value is different from the type of the varobj's old
+ value.
+
+ NEW_VALUE may be NULL, if the varobj is now out of scope. */
+
+static bool
+varobj_value_has_mutated (const struct varobj *var, struct value *new_value,
+ struct type *new_type)
+{
+ /* If we haven't previously computed the number of children in var,
+ it does not matter from the front-end's perspective whether
+ the type has mutated or not. For all intents and purposes,
+ it has not mutated. */
+ if (var->num_children < 0)
+ return false;
+
+ if (var->root->lang_ops->value_has_mutated != NULL)
+ {
+ /* The varobj module, when installing new values, explicitly strips
+ references, saying that we're not interested in those addresses.
+ But detection of mutation happens before installing the new
+ value, so our value may be a reference that we need to strip
+ in order to remain consistent. */
+ if (new_value != NULL)
+ new_value = coerce_ref (new_value);
+ return var->root->lang_ops->value_has_mutated (var, new_value, new_type);
+ }
+ else
+ return false;
+}
+
+/* Update the values for a variable and its children. This is a
+ two-pronged attack. First, re-parse the value for the root's
+ expression to see if it's changed. Then go all the way
+ through its children, reconstructing them and noting if they've
+ changed.
+
+ The IS_EXPLICIT parameter specifies if this call is result
+ of MI request to update this specific variable, or
+ result of implicit -var-update *. For implicit request, we don't
+ update frozen variables.
+
+ NOTE: This function may delete the caller's varobj. If it
+ returns TYPE_CHANGED, then it has done this and VARP will be modified
+ to point to the new varobj. */
+
+std::vector<varobj_update_result>
+varobj_update (struct varobj **varp, bool is_explicit)
+{
+ bool type_changed = false;
+ struct value *newobj;
+ std::vector<varobj_update_result> stack;
+ std::vector<varobj_update_result> result;
+
+ /* Frozen means frozen -- we don't check for any change in
+ this varobj, including its going out of scope, or
changing type. One use case for frozen varobjs is
retaining previously evaluated expressions, and we don't
want them to be reevaluated at all. */
- if (!explicit && (*varp)->frozen)
+ if (!is_explicit && (*varp)->frozen)
return result;
if (!(*varp)->root->is_valid)
{
- varobj_update_result r = {*varp};
- r.status = VAROBJ_INVALID;
- VEC_safe_push (varobj_update_result, result, &r);
+ result.emplace_back (*varp, VAROBJ_INVALID);
return result;
}
if ((*varp)->root->rootvar == *varp)
{
- varobj_update_result r = {*varp};
- r.status = VAROBJ_IN_SCOPE;
+ varobj_update_result r (*varp);
- /* Update the root variable. value_of_root can return NULL
+ /* Update the root variable. value_of_root can return NULL
if the variable is no longer around, i.e. we stepped out of
- the frame in which a local existed. We are letting the
+ the frame in which a local existed. We are letting the
value_of_root variable dispose of the varobj if the type
has changed. */
- new = value_of_root (varp, &type_changed);
+ newobj = value_of_root (varp, &type_changed);
+ if (update_type_if_necessary (*varp, newobj))
+ type_changed = true;
r.varobj = *varp;
-
r.type_changed = type_changed;
- if (install_new_value ((*varp), new, type_changed))
- r.changed = 1;
+ if (install_new_value ((*varp), newobj, type_changed))
+ r.changed = true;
- if (new == NULL)
+ if (newobj == NULL)
r.status = VAROBJ_NOT_IN_SCOPE;
-
- if (r.type_changed || r.changed)
- VEC_safe_push (varobj_update_result, result, &r);
+ r.value_installed = true;
if (r.status == VAROBJ_NOT_IN_SCOPE)
- return result;
- }
+ {
+ if (r.type_changed || r.changed)
+ result.push_back (std::move (r));
- VEC_safe_push (varobj_p, stack, *varp);
+ return result;
+ }
+
+ stack.push_back (std::move (r));
+ }
+ else
+ stack.emplace_back (*varp);
/* Walk through the children, reconstructing them all. */
- while (!VEC_empty (varobj_p, stack))
+ while (!stack.empty ())
{
- v = VEC_pop (varobj_p, stack);
+ varobj_update_result r = std::move (stack.back ());
+ stack.pop_back ();
+ struct varobj *v = r.varobj;
+
+ /* Update this variable, unless it's a root, which is already
+ updated. */
+ if (!r.value_installed)
+ {
+ struct type *new_type;
+
+ newobj = value_of_child (v->parent, v->index);
+ if (update_type_if_necessary (v, newobj))
+ r.type_changed = true;
+ if (newobj)
+ new_type = value_type (newobj);
+ else
+ new_type = v->root->lang_ops->type_of_child (v->parent, v->index);
+
+ if (varobj_value_has_mutated (v, newobj, new_type))
+ {
+ /* The children are no longer valid; delete them now.
+ Report the fact that its type changed as well. */
+ varobj_delete (v, 1 /* only_children */);
+ v->num_children = -1;
+ v->to = -1;
+ v->from = -1;
+ v->type = new_type;
+ r.type_changed = true;
+ }
+
+ if (install_new_value (v, newobj, r.type_changed))
+ {
+ r.changed = true;
+ v->updated = false;
+ }
+ }
+
+ /* We probably should not get children of a dynamic varobj, but
+ for which -var-list-children was never invoked. */
+ if (varobj_is_dynamic_p (v))
+ {
+ std::vector<varobj *> changed, type_changed_vec, unchanged, newobj_vec;
+ bool children_changed = false;
+
+ if (v->frozen)
+ continue;
+
+ if (!v->dynamic->children_requested)
+ {
+ bool dummy;
+
+ /* If we initially did not have potential children, but
+ now we do, consider the varobj as changed.
+ Otherwise, if children were never requested, consider
+ it as unchanged -- presumably, such varobj is not yet
+ expanded in the UI, so we need not bother getting
+ it. */
+ if (!varobj_has_more (v, 0))
+ {
+ update_dynamic_varobj_children (v, NULL, NULL, NULL, NULL,
+ &dummy, false, 0, 0);
+ if (varobj_has_more (v, 0))
+ r.changed = true;
+ }
+
+ if (r.changed)
+ result.push_back (std::move (r));
+
+ continue;
+ }
+
+ /* If update_dynamic_varobj_children returns false, then we have
+ a non-conforming pretty-printer, so we skip it. */
+ if (update_dynamic_varobj_children (v, &changed, &type_changed_vec,
+ &newobj_vec,
+ &unchanged, &children_changed,
+ true, v->from, v->to))
+ {
+ if (children_changed || !newobj_vec.empty ())
+ {
+ r.children_changed = true;
+ r.newobj = std::move (newobj_vec);
+ }
+ /* Push in reverse order so that the first child is
+ popped from the work stack first, and so will be
+ added to result first. This does not affect
+ correctness, just "nicer". */
+ for (int i = type_changed_vec.size () - 1; i >= 0; --i)
+ {
+ varobj_update_result item (type_changed_vec[i]);
+
+ /* Type may change only if value was changed. */
+ item.changed = true;
+ item.type_changed = true;
+ item.value_installed = true;
+
+ stack.push_back (std::move (item));
+ }
+ for (int i = changed.size () - 1; i >= 0; --i)
+ {
+ varobj_update_result item (changed[i]);
+
+ item.changed = true;
+ item.value_installed = true;
+
+ stack.push_back (std::move (item));
+ }
+ for (int i = unchanged.size () - 1; i >= 0; --i)
+ {
+ if (!unchanged[i]->frozen)
+ {
+ varobj_update_result item (unchanged[i]);
+
+ item.value_installed = true;
+
+ stack.push_back (std::move (item));
+ }
+ }
+ if (r.changed || r.children_changed)
+ result.push_back (std::move (r));
+
+ continue;
+ }
+ }
/* Push any children. Use reverse order so that the first
child is popped from the work stack first, and so
will be added to result first. This does not
affect correctness, just "nicer". */
- for (i = VEC_length (varobj_p, v->children)-1; i >= 0; --i)
+ for (int i = v->children.size () - 1; i >= 0; --i)
{
- varobj_p c = VEC_index (varobj_p, v->children, i);
+ varobj *c = v->children[i];
+
/* Child may be NULL if explicitly deleted by -var-delete. */
if (c != NULL && !c->frozen)
- VEC_safe_push (varobj_p, stack, c);
+ stack.emplace_back (c);
}
- /* Update this variable, unless it's a root, which is already
- updated. */
- if (v->root->rootvar != v)
- {
- new = value_of_child (v->parent, v->index);
- if (install_new_value (v, new, 0 /* type not changed */))
- {
- /* Note that it's changed */
- varobj_update_result r = {v};
- r.changed = 1;
- VEC_safe_push (varobj_update_result, result, &r);
- v->updated = 0;
- }
- }
+ if (r.changed || r.type_changed)
+ result.push_back (std::move (r));
}
- VEC_free (varobj_p, stack);
return result;
}
-\f
/* Helper functions */
*/
static int
-delete_variable (struct cpstack **resultp, struct varobj *var,
- int only_children_p)
+delete_variable (struct varobj *var, bool only_children_p)
{
int delcount = 0;
- delete_variable_1 (resultp, &delcount, var,
- only_children_p, 1 /* remove_from_parent_p */ );
+ delete_variable_1 (&delcount, var, only_children_p,
+ true /* remove_from_parent_p */ );
return delcount;
}
-/* Delete the variable object VAR and its children */
+/* Delete the variable object VAR and its children. */
/* IMPORTANT NOTE: If we delete a variable which is a child
and the parent is not removed we dump core. It must be always
- initially called with remove_from_parent_p set */
+ initially called with remove_from_parent_p set. */
static void
-delete_variable_1 (struct cpstack **resultp, int *delcountp,
- struct varobj *var, int only_children_p,
- int remove_from_parent_p)
+delete_variable_1 (int *delcountp, struct varobj *var, bool only_children_p,
+ bool remove_from_parent_p)
{
- int i;
-
- /* Delete any children of this variable, too. */
- for (i = 0; i < VEC_length (varobj_p, var->children); ++i)
+ /* Delete any children of this variable, too. */
+ for (varobj *child : var->children)
{
- varobj_p child = VEC_index (varobj_p, var->children, i);
if (!child)
continue;
+
if (!remove_from_parent_p)
child->parent = NULL;
- delete_variable_1 (resultp, delcountp, child, 0, only_children_p);
+
+ delete_variable_1 (delcountp, child, false, only_children_p);
}
- VEC_free (varobj_p, var->children);
+ var->children.clear ();
- /* if we were called to delete only the children we are done here */
+ /* if we were called to delete only the children we are done here. */
if (only_children_p)
return;
- /* Otherwise, add it to the list of deleted ones and proceed to do so */
- /* If the name is null, this is a temporary variable, that has not
- yet been installed, don't report it, it belongs to the caller... */
- if (var->obj_name != NULL)
+ /* Otherwise, add it to the list of deleted ones and proceed to do so. */
+ /* If the name is empty, this is a temporary variable, that has not
+ yet been installed, don't report it, it belongs to the caller... */
+ if (!var->obj_name.empty ())
{
- cppush (resultp, xstrdup (var->obj_name));
*delcountp = *delcountp + 1;
}
- /* If this variable has a parent, remove it from its parent's list */
+ /* If this variable has a parent, remove it from its parent's list. */
/* OPTIMIZATION: if the parent of this variable is also being deleted,
(as indicated by remove_from_parent_p) we don't bother doing an
expensive list search to find the element to remove when we are
- discarding the list afterwards */
+ discarding the list afterwards. */
if ((remove_from_parent_p) && (var->parent != NULL))
- {
- VEC_replace (varobj_p, var->parent->children, var->index, NULL);
- }
+ var->parent->children[var->index] = NULL;
- if (var->obj_name != NULL)
+ if (!var->obj_name.empty ())
uninstall_variable (var);
- /* Free memory associated with this variable */
- free_variable (var);
+ /* Free memory associated with this variable. */
+ delete var;
}
-/* Install the given variable VAR with the object name VAR->OBJ_NAME. */
-static int
+/* Install the given variable VAR with the object name VAR->OBJ_NAME. */
+static bool
install_variable (struct varobj *var)
{
struct vlist *cv;
unsigned int index = 0;
unsigned int i = 1;
- for (chp = var->obj_name; *chp; chp++)
+ for (chp = var->obj_name.c_str (); *chp; chp++)
{
index = (index + (i++ * (unsigned int) *chp)) % VAROBJ_TABLE_SIZE;
}
cv = *(varobj_table + index);
- while ((cv != NULL) && (strcmp (cv->var->obj_name, var->obj_name) != 0))
+ while (cv != NULL && cv->var->obj_name != var->obj_name)
cv = cv->next;
if (cv != NULL)
error (_("Duplicate variable object name"));
- /* Add varobj to hash table */
- newvl = xmalloc (sizeof (struct vlist));
+ /* Add varobj to hash table. */
+ newvl = XNEW (struct vlist);
newvl->next = *(varobj_table + index);
newvl->var = var;
*(varobj_table + index) = newvl;
- /* If root, add varobj to root list */
+ /* If root, add varobj to root list. */
if (is_root_p (var))
{
- /* Add to list of root variables */
+ /* Add to list of root variables. */
if (rootlist == NULL)
var->root->next = NULL;
else
var->root->next = rootlist;
rootlist = var->root;
- rootcount++;
}
- return 1; /* OK */
+ return true; /* OK */
}
-/* Unistall the object VAR. */
+/* Uninstall the object VAR. */
static void
uninstall_variable (struct varobj *var)
{
unsigned int index = 0;
unsigned int i = 1;
- /* Remove varobj from hash table */
- for (chp = var->obj_name; *chp; chp++)
+ /* Remove varobj from hash table. */
+ for (chp = var->obj_name.c_str (); *chp; chp++)
{
index = (index + (i++ * (unsigned int) *chp)) % VAROBJ_TABLE_SIZE;
}
cv = *(varobj_table + index);
prev = NULL;
- while ((cv != NULL) && (strcmp (cv->var->obj_name, var->obj_name) != 0))
+ while (cv != NULL && cv->var->obj_name != var->obj_name)
{
prev = cv;
cv = cv->next;
}
if (varobjdebug)
- fprintf_unfiltered (gdb_stdlog, "Deleting %s\n", var->obj_name);
+ fprintf_unfiltered (gdb_stdlog, "Deleting %s\n", var->obj_name.c_str ());
if (cv == NULL)
{
warning
("Assertion failed: Could not find variable object \"%s\" to delete",
- var->obj_name);
+ var->obj_name.c_str ());
return;
}
xfree (cv);
- /* If root, remove varobj from root list */
+ /* If root, remove varobj from root list. */
if (is_root_p (var))
{
- /* Remove from list of root variables */
+ /* Remove from list of root variables. */
if (rootlist == var->root)
rootlist = var->root->next;
else
}
if (cr == NULL)
{
- warning
- ("Assertion failed: Could not find varobj \"%s\" in root list",
- var->obj_name);
+ warning (_("Assertion failed: Could not find "
+ "varobj \"%s\" in root list"),
+ var->obj_name.c_str ());
return;
}
if (prer == NULL)
else
prer->next = cr->next;
}
- rootcount--;
}
}
-/* Create and install a child of the parent of the given name */
+/* Create and install a child of the parent of the given name.
+
+ The created VAROBJ takes ownership of the allocated NAME. */
+
static struct varobj *
-create_child (struct varobj *parent, int index, char *name)
+create_child (struct varobj *parent, int index, std::string &name)
{
- struct varobj *child;
- char *childs_name;
- struct value *value;
+ struct varobj_item item;
+
+ std::swap (item.name, name);
+ item.value = value_of_child (parent, index);
+
+ return create_child_with_value (parent, index, &item);
+}
- child = new_variable ();
+static struct varobj *
+create_child_with_value (struct varobj *parent, int index,
+ struct varobj_item *item)
+{
+ varobj *child = new varobj (parent->root);
- /* name is allocated by name_of_child */
- child->name = name;
+ /* NAME is allocated by caller. */
+ std::swap (child->name, item->name);
child->index = index;
- value = value_of_child (parent, index);
child->parent = parent;
- child->root = parent->root;
- childs_name = xstrprintf ("%s.%s", parent->obj_name, name);
- child->obj_name = childs_name;
+
+ if (varobj_is_anonymous_child (child))
+ child->obj_name = string_printf ("%s.%d_anonymous",
+ parent->obj_name.c_str (), index);
+ else
+ child->obj_name = string_printf ("%s.%s",
+ parent->obj_name.c_str (),
+ child->name.c_str ());
+
install_variable (child);
/* Compute the type of the child. Must do this before
calling install_new_value. */
- if (value != NULL)
+ if (item->value != NULL)
/* If the child had no evaluation errors, var->value
- will be non-NULL and contain a valid type. */
- child->type = value_type (value);
+ will be non-NULL and contain a valid type. */
+ child->type = value_actual_type (item->value, 0, NULL);
else
- /* Otherwise, we must compute the type. */
- child->type = (*child->root->lang->type_of_child) (child->parent,
- child->index);
- install_new_value (child, value, 1);
+ /* Otherwise, we must compute the type. */
+ child->type = (*child->root->lang_ops->type_of_child) (child->parent,
+ child->index);
+ install_new_value (child, item->value, 1);
return child;
}
* Miscellaneous utility functions.
*/
-/* Allocate memory and initialize a new variable */
-static struct varobj *
-new_variable (void)
+/* Allocate memory and initialize a new variable. */
+varobj::varobj (varobj_root *root_)
+: root (root_), dynamic (new varobj_dynamic)
{
- struct varobj *var;
-
- var = (struct varobj *) xmalloc (sizeof (struct varobj));
- var->name = NULL;
- var->path_expr = NULL;
- var->obj_name = NULL;
- var->index = -1;
- var->type = NULL;
- var->value = NULL;
- var->num_children = -1;
- var->parent = NULL;
- var->children = NULL;
- var->format = 0;
- var->root = NULL;
- var->updated = 0;
- var->print_value = NULL;
- var->frozen = 0;
- var->not_fetched = 0;
-
- return var;
}
-/* Allocate memory and initialize a new root variable */
-static struct varobj *
-new_root_variable (void)
-{
- struct varobj *var = new_variable ();
- var->root = (struct varobj_root *) xmalloc (sizeof (struct varobj_root));;
- var->root->lang = NULL;
- var->root->exp = NULL;
- var->root->valid_block = NULL;
- var->root->frame = null_frame_id;
- var->root->floating = 0;
- var->root->rootvar = NULL;
- var->root->is_valid = 1;
+/* Free any allocated memory associated with VAR. */
- return var;
-}
-
-/* Free any allocated memory associated with VAR. */
-static void
-free_variable (struct varobj *var)
+varobj::~varobj ()
{
- /* Free the expression if this is a root variable. */
- if (is_root_p (var))
- {
- free_current_contents (&var->root->exp);
- xfree (var->root);
- }
-
- xfree (var->name);
- xfree (var->obj_name);
- xfree (var->print_value);
- xfree (var->path_expr);
- xfree (var);
-}
+ varobj *var = this;
-static void
-do_free_variable_cleanup (void *var)
-{
- free_variable (var);
-}
-
-static struct cleanup *
-make_cleanup_free_variable (struct varobj *var)
-{
- return make_cleanup (do_free_variable_cleanup, var);
-}
+#if HAVE_PYTHON
+ if (var->dynamic->pretty_printer != NULL)
+ {
+ gdbpy_enter_varobj enter_py (var);
-/* This returns the type of the variable. It also skips past typedefs
- to return the real type of the variable.
+ Py_XDECREF (var->dynamic->constructor);
+ Py_XDECREF (var->dynamic->pretty_printer);
+ }
+#endif
- NOTE: TYPE_TARGET_TYPE should NOT be used anywhere in this file
- except within get_target_type and get_type. */
-static struct type *
-get_type (struct varobj *var)
-{
- struct type *type;
- type = var->type;
+ varobj_iter_delete (var->dynamic->child_iter);
+ varobj_clear_saved_item (var->dynamic);
- if (type != NULL)
- type = check_typedef (type);
+ if (is_root_p (var))
+ delete var->root;
- return type;
+ delete var->dynamic;
}
/* Return the type of the value that's stored in VAR,
or that would have being stored there if the
- value were accessible.
+ value were accessible.
This differs from VAR->type in that VAR->type is always
- the true type of the expession in the source language.
+ the true type of the expression in the source language.
The return value of this function is the type we're
actually storing in varobj, and using for displaying
the values and for comparing previous and new values.
For example, top-level references are always stripped. */
-static struct type *
-get_value_type (struct varobj *var)
-{
- struct type *type;
-
- if (var->value)
- type = value_type (var->value);
- else
- type = var->type;
-
- type = check_typedef (type);
-
- if (TYPE_CODE (type) == TYPE_CODE_REF)
- type = get_target_type (type);
-
- type = check_typedef (type);
-
- return type;
-}
-
-/* This returns the target type (or NULL) of TYPE, also skipping
- past typedefs, just like get_type ().
-
- NOTE: TYPE_TARGET_TYPE should NOT be used anywhere in this file
- except within get_target_type and get_type. */
-static struct type *
-get_target_type (struct type *type)
-{
- if (type != NULL)
- {
- type = TYPE_TARGET_TYPE (type);
- if (type != NULL)
- type = check_typedef (type);
- }
-
- return type;
-}
-
-/* What is the default display for this variable? We assume that
- everything is "natural". Any exceptions? */
-static enum varobj_display_formats
-variable_default_display (struct varobj *var)
-{
- return FORMAT_NATURAL;
-}
-
-/* FIXME: The following should be generic for any pointer */
-static void
-cppush (struct cpstack **pstack, char *name)
-{
- struct cpstack *s;
-
- s = (struct cpstack *) xmalloc (sizeof (struct cpstack));
- s->name = name;
- s->next = *pstack;
- *pstack = s;
-}
-
-/* FIXME: The following should be generic for any pointer */
-static char *
-cppop (struct cpstack **pstack)
-{
- struct cpstack *s;
- char *v;
-
- if ((*pstack)->name == NULL && (*pstack)->next == NULL)
- return NULL;
-
- s = *pstack;
- v = s->name;
- *pstack = (*pstack)->next;
- xfree (s);
-
- return v;
-}
-\f
-/*
- * Language-dependencies
- */
-
-/* Common entry points */
-
-/* Get the language of variable VAR. */
-static enum varobj_languages
-variable_language (struct varobj *var)
-{
- enum varobj_languages lang;
-
- switch (var->root->exp->language_defn->la_language)
- {
- default:
- case language_c:
- lang = vlang_c;
- break;
- case language_cplus:
- lang = vlang_cplus;
- break;
- case language_java:
- lang = vlang_java;
- break;
- }
-
- return lang;
-}
-
-/* Return the number of children for a given variable.
- The result of this function is defined by the language
- implementation. The number of children returned by this function
- is the number of children that the user will see in the variable
- display. */
-static int
-number_of_children (struct varobj *var)
-{
- return (*var->root->lang->number_of_children) (var);;
-}
-
-/* What is the expression for the root varobj VAR? Returns a malloc'd string. */
-static char *
-name_of_variable (struct varobj *var)
-{
- return (*var->root->lang->name_of_variable) (var);
-}
-
-/* What is the name of the INDEX'th child of VAR? Returns a malloc'd string. */
-static char *
-name_of_child (struct varobj *var, int index)
-{
- return (*var->root->lang->name_of_child) (var, index);
-}
-
-/* What is the ``struct value *'' of the root variable VAR?
- For floating variable object, evaluation can get us a value
- of different type from what is stored in varobj already. In
- that case:
- - *type_changed will be set to 1
- - old varobj will be freed, and new one will be
- created, with the same name.
- - *var_handle will be set to the new varobj
- Otherwise, *type_changed will be set to 0. */
-static struct value *
-value_of_root (struct varobj **var_handle, int *type_changed)
-{
- struct varobj *var;
-
- if (var_handle == NULL)
- return NULL;
-
- var = *var_handle;
-
- /* This should really be an exception, since this should
- only get called with a root variable. */
-
- if (!is_root_p (var))
- return NULL;
-
- if (var->root->floating)
- {
- struct varobj *tmp_var;
- char *old_type, *new_type;
-
- tmp_var = varobj_create (NULL, var->name, (CORE_ADDR) 0,
- USE_SELECTED_FRAME);
- if (tmp_var == NULL)
- {
- return NULL;
- }
- old_type = varobj_get_type (var);
- new_type = varobj_get_type (tmp_var);
- if (strcmp (old_type, new_type) == 0)
- {
- /* The expression presently stored inside var->root->exp
- remembers the locations of local variables relatively to
- the frame where the expression was created (in DWARF location
- button, for example). Naturally, those locations are not
- correct in other frames, so update the expression. */
-
- struct expression *tmp_exp = var->root->exp;
- var->root->exp = tmp_var->root->exp;
- tmp_var->root->exp = tmp_exp;
-
- varobj_delete (tmp_var, NULL, 0);
- *type_changed = 0;
- }
- else
- {
- tmp_var->obj_name =
- savestring (var->obj_name, strlen (var->obj_name));
- varobj_delete (var, NULL, 0);
-
- install_variable (tmp_var);
- *var_handle = tmp_var;
- var = *var_handle;
- *type_changed = 1;
- }
- xfree (old_type);
- xfree (new_type);
- }
- else
- {
- *type_changed = 0;
- }
-
- return (*var->root->lang->value_of_root) (var_handle);
-}
-
-/* What is the ``struct value *'' for the INDEX'th child of PARENT? */
-static struct value *
-value_of_child (struct varobj *parent, int index)
-{
- struct value *value;
-
- value = (*parent->root->lang->value_of_child) (parent, index);
-
- return value;
-}
-
-/* GDB already has a command called "value_of_variable". Sigh. */
-static char *
-my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
-{
- if (var->root->is_valid)
- return (*var->root->lang->value_of_variable) (var, format);
- else
- return NULL;
-}
-
-static char *
-value_get_print_value (struct value *value, enum varobj_display_formats format)
-{
- long dummy;
- struct ui_file *stb;
- struct cleanup *old_chain;
- char *thevalue;
-
- if (value == NULL)
- return NULL;
-
- stb = mem_fileopen ();
- old_chain = make_cleanup_ui_file_delete (stb);
-
- common_val_print (value, stb, format_code[(int) format], 1, 0, 0,
- current_language);
- thevalue = ui_file_xstrdup (stb, &dummy);
-
- do_cleanups (old_chain);
- return thevalue;
-}
-
-int
-varobj_editable_p (struct varobj *var)
-{
- struct type *type;
- struct value *value;
-
- if (!(var->root->is_valid && var->value && VALUE_LVAL (var->value)))
- return 0;
-
- type = get_value_type (var);
-
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- case TYPE_CODE_ARRAY:
- case TYPE_CODE_FUNC:
- case TYPE_CODE_METHOD:
- return 0;
- break;
-
- default:
- return 1;
- break;
- }
-}
-
-/* Return non-zero if changes in value of VAR
- must be detected and reported by -var-update.
- Return zero is -var-update should never report
- changes of such values. This makes sense for structures
- (since the changes in children values will be reported separately),
- or for artifical objects (like 'public' pseudo-field in C++).
-
- Return value of 0 means that gdb need not call value_fetch_lazy
- for the value of this variable object. */
-static int
-varobj_value_is_changeable_p (struct varobj *var)
+struct type *
+varobj_get_value_type (const struct varobj *var)
{
- int r;
struct type *type;
- if (CPLUS_FAKE_CHILD (var))
- return 0;
-
- type = get_value_type (var);
-
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- case TYPE_CODE_ARRAY:
- r = 0;
- break;
-
- default:
- r = 1;
- }
-
- return r;
-}
-
-/* Return 1 if that varobj is floating, that is is always evaluated in the
- selected frame, and not bound to thread/frame. Such variable objects
- are created using '@' as frame specifier to -var-create. */
-int
-varobj_floating_p (struct varobj *var)
-{
- return var->root->floating;
-}
-
-/* Given the value and the type of a variable object,
- adjust the value and type to those necessary
- for getting children of the variable object.
- This includes dereferencing top-level references
- to all types and dereferencing pointers to
- structures.
-
- Both TYPE and *TYPE should be non-null. VALUE
- can be null if we want to only translate type.
- *VALUE can be null as well -- if the parent
- value is not known.
-
- If WAS_PTR is not NULL, set *WAS_PTR to 0 or 1
- depending on whether pointer was deferenced
- in this function. */
-static void
-adjust_value_for_child_access (struct value **value,
- struct type **type,
- int *was_ptr)
-{
- gdb_assert (type && *type);
-
- if (was_ptr)
- *was_ptr = 0;
-
- *type = check_typedef (*type);
-
- /* The type of value stored in varobj, that is passed
- to us, is already supposed to be
- reference-stripped. */
-
- gdb_assert (TYPE_CODE (*type) != TYPE_CODE_REF);
-
- /* Pointers to structures are treated just like
- structures when accessing children. Don't
- dererences pointers to other types. */
- if (TYPE_CODE (*type) == TYPE_CODE_PTR)
- {
- struct type *target_type = get_target_type (*type);
- if (TYPE_CODE (target_type) == TYPE_CODE_STRUCT
- || TYPE_CODE (target_type) == TYPE_CODE_UNION)
- {
- if (value && *value)
- {
- int success = gdb_value_ind (*value, value);
- if (!success)
- *value = NULL;
- }
- *type = target_type;
- if (was_ptr)
- *was_ptr = 1;
- }
- }
-
- /* The 'get_target_type' function calls check_typedef on
- result, so we can immediately check type code. No
- need to call check_typedef here. */
-}
-
-/* C */
-static int
-c_number_of_children (struct varobj *var)
-{
- struct type *type = get_value_type (var);
- int children = 0;
- struct type *target;
-
- adjust_value_for_child_access (NULL, &type, NULL);
- target = get_target_type (type);
-
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_ARRAY:
- if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (target) > 0
- && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
- children = TYPE_LENGTH (type) / TYPE_LENGTH (target);
- else
- /* If we don't know how many elements there are, don't display
- any. */
- children = 0;
- break;
-
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- children = TYPE_NFIELDS (type);
- break;
-
- case TYPE_CODE_PTR:
- /* The type here is a pointer to non-struct. Typically, pointers
- have one child, except for function ptrs, which have no children,
- and except for void*, as we don't know what to show.
-
- We can show char* so we allow it to be dereferenced. If you decide
- to test for it, please mind that a little magic is necessary to
- properly identify it: char* has TYPE_CODE == TYPE_CODE_INT and
- TYPE_NAME == "char" */
- if (TYPE_CODE (target) == TYPE_CODE_FUNC
- || TYPE_CODE (target) == TYPE_CODE_VOID)
- children = 0;
- else
- children = 1;
- break;
-
- default:
- /* Other types have no children */
- break;
- }
-
- return children;
-}
-
-static char *
-c_name_of_variable (struct varobj *parent)
-{
- return savestring (parent->name, strlen (parent->name));
-}
-
-/* Return the value of element TYPE_INDEX of a structure
- value VALUE. VALUE's type should be a structure,
- or union, or a typedef to struct/union.
-
- Returns NULL if getting the value fails. Never throws. */
-static struct value *
-value_struct_element_index (struct value *value, int type_index)
-{
- struct value *result = NULL;
- volatile struct gdb_exception e;
-
- struct type *type = value_type (value);
- type = check_typedef (type);
-
- gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
- || TYPE_CODE (type) == TYPE_CODE_UNION);
-
- TRY_CATCH (e, RETURN_MASK_ERROR)
- {
- if (TYPE_FIELD_STATIC (type, type_index))
- result = value_static_field (type, type_index);
- else
- result = value_primitive_field (value, 0, type_index, type);
- }
- if (e.reason < 0)
- {
- return NULL;
- }
+ if (var->value != nullptr)
+ type = value_type (var->value.get ());
else
- {
- return result;
- }
-}
-
-/* Obtain the information about child INDEX of the variable
- object PARENT.
- If CNAME is not null, sets *CNAME to the name of the child relative
- to the parent.
- If CVALUE is not null, sets *CVALUE to the value of the child.
- If CTYPE is not null, sets *CTYPE to the type of the child.
-
- If any of CNAME, CVALUE, or CTYPE is not null, but the corresponding
- information cannot be determined, set *CNAME, *CVALUE, or *CTYPE
- to NULL. */
-static void
-c_describe_child (struct varobj *parent, int index,
- char **cname, struct value **cvalue, struct type **ctype,
- char **cfull_expression)
-{
- struct value *value = parent->value;
- struct type *type = get_value_type (parent);
- char *parent_expression = NULL;
- int was_ptr;
-
- if (cname)
- *cname = NULL;
- if (cvalue)
- *cvalue = NULL;
- if (ctype)
- *ctype = NULL;
- if (cfull_expression)
- {
- *cfull_expression = NULL;
- parent_expression = varobj_get_path_expr (parent);
- }
- adjust_value_for_child_access (&value, &type, &was_ptr);
-
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_ARRAY:
- if (cname)
- *cname = xstrprintf ("%d", index
- + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)));
-
- if (cvalue && value)
- {
- int real_index = index + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type));
- struct value *indval =
- value_from_longest (builtin_type_int, (LONGEST) real_index);
- gdb_value_subscript (value, indval, cvalue);
- }
-
- if (ctype)
- *ctype = get_target_type (type);
-
- if (cfull_expression)
- *cfull_expression = xstrprintf ("(%s)[%d]", parent_expression,
- index
- + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)));
-
-
- break;
-
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- if (cname)
- {
- char *string = TYPE_FIELD_NAME (type, index);
- *cname = savestring (string, strlen (string));
- }
-
- if (cvalue && value)
- {
- /* For C, varobj index is the same as type index. */
- *cvalue = value_struct_element_index (value, index);
- }
+ type = var->type;
- if (ctype)
- *ctype = TYPE_FIELD_TYPE (type, index);
+ type = check_typedef (type);
- if (cfull_expression)
- {
- char *join = was_ptr ? "->" : ".";
- *cfull_expression = xstrprintf ("(%s)%s%s", parent_expression, join,
- TYPE_FIELD_NAME (type, index));
- }
+ if (TYPE_IS_REFERENCE (type))
+ type = get_target_type (type);
- break;
+ type = check_typedef (type);
- case TYPE_CODE_PTR:
- if (cname)
- *cname = xstrprintf ("*%s", parent->name);
+ return type;
+}
- if (cvalue && value)
- {
- int success = gdb_value_ind (value, cvalue);
- if (!success)
- *cvalue = NULL;
- }
+/* What is the default display for this variable? We assume that
+ everything is "natural". Any exceptions? */
+static enum varobj_display_formats
+variable_default_display (struct varobj *var)
+{
+ return FORMAT_NATURAL;
+}
- /* Don't use get_target_type because it calls
- check_typedef and here, we want to show the true
- declared type of the variable. */
- if (ctype)
- *ctype = TYPE_TARGET_TYPE (type);
+/*
+ * Language-dependencies
+ */
- if (cfull_expression)
- *cfull_expression = xstrprintf ("*(%s)", parent_expression);
-
- break;
+/* Common entry points */
- default:
- /* This should not happen */
- if (cname)
- *cname = xstrdup ("???");
- if (cfull_expression)
- *cfull_expression = xstrdup ("???");
- /* Don't set value and type, we don't know then. */
- }
+/* Return the number of children for a given variable.
+ The result of this function is defined by the language
+ implementation. The number of children returned by this function
+ is the number of children that the user will see in the variable
+ display. */
+static int
+number_of_children (const struct varobj *var)
+{
+ return (*var->root->lang_ops->number_of_children) (var);
}
-static char *
-c_name_of_child (struct varobj *parent, int index)
+/* What is the expression for the root varobj VAR? */
+
+static std::string
+name_of_variable (const struct varobj *var)
{
- char *name;
- c_describe_child (parent, index, &name, NULL, NULL, NULL);
- return name;
+ return (*var->root->lang_ops->name_of_variable) (var);
}
-static char *
-c_path_expr_of_child (struct varobj *child)
+/* What is the name of the INDEX'th child of VAR? */
+
+static std::string
+name_of_child (struct varobj *var, int index)
{
- c_describe_child (child->parent, child->index, NULL, NULL, NULL,
- &child->path_expr);
- return child->path_expr;
+ return (*var->root->lang_ops->name_of_child) (var, index);
}
/* If frame associated with VAR can be found, switch
- to it and return 1. Otherwise, return 0. */
-static int
-check_scope (struct varobj *var)
+ to it and return true. Otherwise, return false. */
+
+static bool
+check_scope (const struct varobj *var)
{
struct frame_info *fi;
- int scope;
+ bool scope;
fi = frame_find_by_id (var->root->frame);
scope = fi != NULL;
if (fi)
{
CORE_ADDR pc = get_frame_pc (fi);
+
if (pc < BLOCK_START (var->root->valid_block) ||
pc >= BLOCK_END (var->root->valid_block))
- scope = 0;
+ scope = false;
else
select_frame (fi);
}
return scope;
}
+/* Helper function to value_of_root. */
+
static struct value *
-c_value_of_root (struct varobj **var_handle)
+value_of_root_1 (struct varobj **var_handle)
{
struct value *new_val = NULL;
struct varobj *var = *var_handle;
- struct frame_info *fi;
- int within_scope = 0;
- struct cleanup *back_to;
+ bool within_scope = false;
- /* Only root variables can be updated... */
+ /* Only root variables can be updated... */
if (!is_root_p (var))
- /* Not a root var */
+ /* Not a root var. */
return NULL;
- back_to = make_cleanup_restore_current_thread (
- inferior_ptid, get_frame_id (deprecated_safe_get_selected_frame ()));
+ scoped_restore_current_thread restore_thread;
- /* Determine whether the variable is still around. */
+ /* Determine whether the variable is still around. */
if (var->root->valid_block == NULL || var->root->floating)
- within_scope = 1;
+ within_scope = true;
else if (var->root->thread_id == 0)
{
/* The program was single-threaded when the variable object was
}
else
{
- ptid_t ptid = thread_id_to_pid (var->root->thread_id);
- if (in_thread_list (ptid))
+ thread_info *thread = find_thread_global_id (var->root->thread_id);
+
+ if (thread != NULL)
{
- switch_to_thread (ptid);
+ switch_to_thread (thread);
within_scope = check_scope (var);
}
}
if (within_scope)
{
+
/* We need to catch errors here, because if evaluate
expression fails we want to just return NULL. */
- gdb_evaluate_expression (var->root->exp, &new_val);
- return new_val;
+ try
+ {
+ new_val = evaluate_expression (var->root->exp.get ());
+ }
+ catch (const gdb_exception_error &except)
+ {
+ }
}
- do_cleanups (back_to);
-
- return NULL;
+ return new_val;
}
+/* What is the ``struct value *'' of the root variable VAR?
+ For floating variable object, evaluation can get us a value
+ of different type from what is stored in varobj already. In
+ that case:
+ - *type_changed will be set to 1
+ - old varobj will be freed, and new one will be
+ created, with the same name.
+ - *var_handle will be set to the new varobj
+ Otherwise, *type_changed will be set to 0. */
static struct value *
-c_value_of_child (struct varobj *parent, int index)
-{
- struct value *value = NULL;
- c_describe_child (parent, index, NULL, &value, NULL, NULL);
-
- return value;
-}
-
-static struct type *
-c_type_of_child (struct varobj *parent, int index)
-{
- struct type *type = NULL;
- c_describe_child (parent, index, NULL, NULL, &type, NULL);
- return type;
-}
-
-static char *
-c_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+value_of_root (struct varobj **var_handle, bool *type_changed)
{
- /* BOGUS: if val_print sees a struct/class, or a reference to one,
- it will print out its children instead of "{...}". So we need to
- catch that case explicitly. */
- struct type *type = get_type (var);
-
- /* Strip top-level references. */
- while (TYPE_CODE (type) == TYPE_CODE_REF)
- type = check_typedef (TYPE_TARGET_TYPE (type));
-
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- return xstrdup ("{...}");
- /* break; */
-
- case TYPE_CODE_ARRAY:
- {
- char *number;
- number = xstrprintf ("[%d]", var->num_children);
- return (number);
- }
- /* break; */
+ struct varobj *var;
- default:
- {
- if (var->value == NULL)
- {
- /* This can happen if we attempt to get the value of a struct
- member when the parent is an invalid pointer. This is an
- error condition, so we should tell the caller. */
- return NULL;
- }
- else
- {
- if (var->not_fetched && value_lazy (var->value))
- /* Frozen variable and no value yet. We don't
- implicitly fetch the value. MI response will
- use empty string for the value, which is OK. */
- return NULL;
-
- gdb_assert (varobj_value_is_changeable_p (var));
- gdb_assert (!value_lazy (var->value));
-
- /* If the specified format is the current one,
- we can reuse print_value */
- if (format == var->format)
- return xstrdup (var->print_value);
- else
- return value_get_print_value (var->value, format);
- }
- }
- }
-}
-\f
+ if (var_handle == NULL)
+ return NULL;
-/* C++ */
+ var = *var_handle;
-static int
-cplus_number_of_children (struct varobj *var)
-{
- struct type *type;
- int children, dont_know;
+ /* This should really be an exception, since this should
+ only get called with a root variable. */
- dont_know = 1;
- children = 0;
+ if (!is_root_p (var))
+ return NULL;
- if (!CPLUS_FAKE_CHILD (var))
+ if (var->root->floating)
{
- type = get_value_type (var);
- adjust_value_for_child_access (NULL, &type, NULL);
+ struct varobj *tmp_var;
- if (((TYPE_CODE (type)) == TYPE_CODE_STRUCT) ||
- ((TYPE_CODE (type)) == TYPE_CODE_UNION))
+ tmp_var = varobj_create (NULL, var->name.c_str (), (CORE_ADDR) 0,
+ USE_SELECTED_FRAME);
+ if (tmp_var == NULL)
+ {
+ return NULL;
+ }
+ std::string old_type = varobj_get_type (var);
+ std::string new_type = varobj_get_type (tmp_var);
+ if (old_type == new_type)
{
- int kids[3];
+ /* The expression presently stored inside var->root->exp
+ remembers the locations of local variables relatively to
+ the frame where the expression was created (in DWARF location
+ button, for example). Naturally, those locations are not
+ correct in other frames, so update the expression. */
- cplus_class_num_children (type, kids);
- if (kids[v_public] != 0)
- children++;
- if (kids[v_private] != 0)
- children++;
- if (kids[v_protected] != 0)
- children++;
+ std::swap (var->root->exp, tmp_var->root->exp);
- /* Add any baseclasses */
- children += TYPE_N_BASECLASSES (type);
- dont_know = 0;
+ varobj_delete (tmp_var, 0);
+ *type_changed = 0;
+ }
+ else
+ {
+ tmp_var->obj_name = var->obj_name;
+ tmp_var->from = var->from;
+ tmp_var->to = var->to;
+ varobj_delete (var, 0);
- /* FIXME: save children in var */
+ install_variable (tmp_var);
+ *var_handle = tmp_var;
+ var = *var_handle;
+ *type_changed = true;
}
}
else
{
- int kids[3];
-
- type = get_value_type (var->parent);
- adjust_value_for_child_access (NULL, &type, NULL);
-
- cplus_class_num_children (type, kids);
- if (strcmp (var->name, "public") == 0)
- children = kids[v_public];
- else if (strcmp (var->name, "private") == 0)
- children = kids[v_private];
- else
- children = kids[v_protected];
- dont_know = 0;
+ *type_changed = 0;
}
- if (dont_know)
- children = c_number_of_children (var);
+ {
+ struct value *value;
- return children;
+ value = value_of_root_1 (var_handle);
+ if (var->value == NULL || value == NULL)
+ {
+ /* For root varobj-s, a NULL value indicates a scoping issue.
+ So, nothing to do in terms of checking for mutations. */
+ }
+ else if (varobj_value_has_mutated (var, value, value_type (value)))
+ {
+ /* The type has mutated, so the children are no longer valid.
+ Just delete them, and tell our caller that the type has
+ changed. */
+ varobj_delete (var, 1 /* only_children */);
+ var->num_children = -1;
+ var->to = -1;
+ var->from = -1;
+ *type_changed = true;
+ }
+ return value;
+ }
}
-/* Compute # of public, private, and protected variables in this class.
- That means we need to descend into all baseclasses and find out
- how many are there, too. */
-static void
-cplus_class_num_children (struct type *type, int children[3])
+/* What is the ``struct value *'' for the INDEX'th child of PARENT? */
+static struct value *
+value_of_child (const struct varobj *parent, int index)
{
- int i;
-
- children[v_public] = 0;
- children[v_private] = 0;
- children[v_protected] = 0;
+ struct value *value;
- for (i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
- {
- /* If we have a virtual table pointer, omit it. */
- if (TYPE_VPTR_BASETYPE (type) == type && TYPE_VPTR_FIELDNO (type) == i)
- continue;
+ value = (*parent->root->lang_ops->value_of_child) (parent, index);
- if (TYPE_FIELD_PROTECTED (type, i))
- children[v_protected]++;
- else if (TYPE_FIELD_PRIVATE (type, i))
- children[v_private]++;
- else
- children[v_public]++;
- }
+ return value;
}
-static char *
-cplus_name_of_variable (struct varobj *parent)
+/* GDB already has a command called "value_of_variable". Sigh. */
+static std::string
+my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
{
- return c_name_of_variable (parent);
+ if (var->root->is_valid)
+ {
+ if (var->dynamic->pretty_printer != NULL)
+ return varobj_value_get_print_value (var->value.get (), var->format,
+ var);
+ return (*var->root->lang_ops->value_of_variable) (var, format);
+ }
+ else
+ return std::string ();
}
-enum accessibility { private_field, protected_field, public_field };
-
-/* Check if field INDEX of TYPE has the specified accessibility.
- Return 0 if so and 1 otherwise. */
-static int
-match_accessibility (struct type *type, int index, enum accessibility acc)
+void
+varobj_formatted_print_options (struct value_print_options *opts,
+ enum varobj_display_formats format)
{
- if (acc == private_field && TYPE_FIELD_PRIVATE (type, index))
- return 1;
- else if (acc == protected_field && TYPE_FIELD_PROTECTED (type, index))
- return 1;
- else if (acc == public_field && !TYPE_FIELD_PRIVATE (type, index)
- && !TYPE_FIELD_PROTECTED (type, index))
- return 1;
- else
- return 0;
+ get_formatted_print_options (opts, format_code[(int) format]);
+ opts->deref_ref = 0;
+ opts->raw = !pretty_printing;
}
-static void
-cplus_describe_child (struct varobj *parent, int index,
- char **cname, struct value **cvalue, struct type **ctype,
- char **cfull_expression)
+std::string
+varobj_value_get_print_value (struct value *value,
+ enum varobj_display_formats format,
+ const struct varobj *var)
{
- char *name = NULL;
- struct value *value;
- struct type *type;
- int was_ptr;
- char *parent_expression = NULL;
-
- if (cname)
- *cname = NULL;
- if (cvalue)
- *cvalue = NULL;
- if (ctype)
- *ctype = NULL;
- if (cfull_expression)
- *cfull_expression = NULL;
-
- if (CPLUS_FAKE_CHILD (parent))
- {
- value = parent->parent->value;
- type = get_value_type (parent->parent);
- if (cfull_expression)
- parent_expression = varobj_get_path_expr (parent->parent);
- }
- else
- {
- value = parent->value;
- type = get_value_type (parent);
- if (cfull_expression)
- parent_expression = varobj_get_path_expr (parent);
- }
-
- adjust_value_for_child_access (&value, &type, &was_ptr);
+ struct value_print_options opts;
+ struct type *type = NULL;
+ long len = 0;
+ gdb::unique_xmalloc_ptr<char> encoding;
+ /* Initialize it just to avoid a GCC false warning. */
+ CORE_ADDR str_addr = 0;
+ bool string_print = false;
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT
- || TYPE_CODE (type) == TYPE_CODE_UNION)
- {
- char *join = was_ptr ? "->" : ".";
- if (CPLUS_FAKE_CHILD (parent))
- {
- /* The fields of the class type are ordered as they
- appear in the class. We are given an index for a
- particular access control type ("public","protected",
- or "private"). We must skip over fields that don't
- have the access control we are looking for to properly
- find the indexed field. */
- int type_index = TYPE_N_BASECLASSES (type);
- enum accessibility acc = public_field;
- if (strcmp (parent->name, "private") == 0)
- acc = private_field;
- else if (strcmp (parent->name, "protected") == 0)
- acc = protected_field;
-
- while (index >= 0)
- {
- if (TYPE_VPTR_BASETYPE (type) == type
- && type_index == TYPE_VPTR_FIELDNO (type))
- ; /* ignore vptr */
- else if (match_accessibility (type, type_index, acc))
- --index;
- ++type_index;
- }
- --type_index;
+ if (value == NULL)
+ return std::string ();
- if (cname)
- *cname = xstrdup (TYPE_FIELD_NAME (type, type_index));
+ string_file stb;
+ std::string thevalue;
- if (cvalue && value)
- *cvalue = value_struct_element_index (value, type_index);
+#if HAVE_PYTHON
+ if (gdb_python_initialized)
+ {
+ PyObject *value_formatter = var->dynamic->pretty_printer;
- if (ctype)
- *ctype = TYPE_FIELD_TYPE (type, type_index);
+ gdbpy_enter_varobj enter_py (var);
- if (cfull_expression)
- *cfull_expression = xstrprintf ("((%s)%s%s)", parent_expression,
- join,
- TYPE_FIELD_NAME (type, type_index));
- }
- else if (index < TYPE_N_BASECLASSES (type))
+ if (value_formatter)
{
- /* This is a baseclass. */
- if (cname)
- *cname = xstrdup (TYPE_FIELD_NAME (type, index));
-
- if (cvalue && value)
- {
- *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
- release_value (*cvalue);
- }
-
- if (ctype)
- {
- *ctype = TYPE_FIELD_TYPE (type, index);
- }
+ /* First check to see if we have any children at all. If so,
+ we simply return {...}. */
+ if (dynamic_varobj_has_child_method (var))
+ return "{...}";
- if (cfull_expression)
+ if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst))
{
- char *ptr = was_ptr ? "*" : "";
- /* Cast the parent to the base' type. Note that in gdb,
- expression like
- (Base1)d
- will create an lvalue, for all appearences, so we don't
- need to use more fancy:
- *(Base1*)(&d)
- construct. */
- *cfull_expression = xstrprintf ("(%s(%s%s) %s)",
- ptr,
- TYPE_FIELD_NAME (type, index),
- ptr,
- parent_expression);
- }
- }
- else
- {
- char *access = NULL;
- int children[3];
- cplus_class_num_children (type, children);
+ struct value *replacement;
- /* Everything beyond the baseclasses can
- only be "public", "private", or "protected"
+ gdbpy_ref<> output = apply_varobj_pretty_printer (value_formatter,
+ &replacement,
+ &stb);
- The special "fake" children are always output by varobj in
- this order. So if INDEX == 2, it MUST be "protected". */
- index -= TYPE_N_BASECLASSES (type);
- switch (index)
- {
- case 0:
- if (children[v_public] > 0)
- access = "public";
- else if (children[v_private] > 0)
- access = "private";
- else
- access = "protected";
- break;
- case 1:
- if (children[v_public] > 0)
+ /* If we have string like output ... */
+ if (output != NULL)
{
- if (children[v_private] > 0)
- access = "private";
+ /* If this is a lazy string, extract it. For lazy
+ strings we always print as a string, so set
+ string_print. */
+ if (gdbpy_is_lazy_string (output.get ()))
+ {
+ gdbpy_extract_lazy_string (output.get (), &str_addr,
+ &type, &len, &encoding);
+ string_print = true;
+ }
else
- access = "protected";
+ {
+ /* If it is a regular (non-lazy) string, extract
+ it and copy the contents into THEVALUE. If the
+ hint says to print it as a string, set
+ string_print. Otherwise just return the extracted
+ string as a value. */
+
+ gdb::unique_xmalloc_ptr<char> s
+ = python_string_to_target_string (output.get ());
+
+ if (s)
+ {
+ struct gdbarch *gdbarch;
+
+ gdb::unique_xmalloc_ptr<char> hint
+ = gdbpy_get_display_hint (value_formatter);
+ if (hint)
+ {
+ if (!strcmp (hint.get (), "string"))
+ string_print = true;
+ }
+
+ thevalue = std::string (s.get ());
+ len = thevalue.size ();
+ gdbarch = get_type_arch (value_type (value));
+ type = builtin_type (gdbarch)->builtin_char;
+
+ if (!string_print)
+ return thevalue;
+ }
+ else
+ gdbpy_print_stack ();
+ }
}
- else if (children[v_private] > 0)
- access = "protected";
- break;
- case 2:
- /* Must be protected */
- access = "protected";
- break;
- default:
- /* error! */
- break;
+ /* If the printer returned a replacement value, set VALUE
+ to REPLACEMENT. If there is not a replacement value,
+ just use the value passed to this function. */
+ if (replacement)
+ value = replacement;
}
-
- gdb_assert (access);
- if (cname)
- *cname = xstrdup (access);
-
- /* Value and type and full expression are null here. */
}
}
+#endif
+
+ varobj_formatted_print_options (&opts, format);
+
+ /* If the THEVALUE has contents, it is a regular string. */
+ if (!thevalue.empty ())
+ LA_PRINT_STRING (&stb, type, (gdb_byte *) thevalue.c_str (),
+ len, encoding.get (), 0, &opts);
+ else if (string_print)
+ /* Otherwise, if string_print is set, and it is not a regular
+ string, it is a lazy string. */
+ val_print_string (type, encoding.get (), str_addr, len, &stb, &opts);
else
- {
- c_describe_child (parent, index, cname, cvalue, ctype, cfull_expression);
- }
-}
+ /* All other cases. */
+ common_val_print (value, &stb, 0, &opts, current_language);
-static char *
-cplus_name_of_child (struct varobj *parent, int index)
-{
- char *name = NULL;
- cplus_describe_child (parent, index, &name, NULL, NULL, NULL);
- return name;
+ return std::move (stb.string ());
}
-static char *
-cplus_path_expr_of_child (struct varobj *child)
+bool
+varobj_editable_p (const struct varobj *var)
{
- cplus_describe_child (child->parent, child->index, NULL, NULL, NULL,
- &child->path_expr);
- return child->path_expr;
-}
+ struct type *type;
-static struct value *
-cplus_value_of_root (struct varobj **var_handle)
-{
- return c_value_of_root (var_handle);
-}
+ if (!(var->root->is_valid && var->value != nullptr
+ && VALUE_LVAL (var->value.get ())))
+ return false;
-static struct value *
-cplus_value_of_child (struct varobj *parent, int index)
-{
- struct value *value = NULL;
- cplus_describe_child (parent, index, NULL, &value, NULL, NULL);
- return value;
-}
+ type = varobj_get_value_type (var);
-static struct type *
-cplus_type_of_child (struct varobj *parent, int index)
-{
- struct type *type = NULL;
- cplus_describe_child (parent, index, NULL, NULL, &type, NULL);
- return type;
-}
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ case TYPE_CODE_ARRAY:
+ case TYPE_CODE_FUNC:
+ case TYPE_CODE_METHOD:
+ return false;
+ break;
-static char *
-cplus_value_of_variable (struct varobj *var, enum varobj_display_formats format)
-{
+ default:
+ return true;
+ break;
+ }
+}
- /* If we have one of our special types, don't print out
- any value. */
- if (CPLUS_FAKE_CHILD (var))
- return xstrdup ("");
+/* Call VAR's value_is_changeable_p language-specific callback. */
- return c_value_of_variable (var, format);
+bool
+varobj_value_is_changeable_p (const struct varobj *var)
+{
+ return var->root->lang_ops->value_is_changeable_p (var);
}
-\f
-/* Java */
-static int
-java_number_of_children (struct varobj *var)
+/* Return true if that varobj is floating, that is is always evaluated in the
+ selected frame, and not bound to thread/frame. Such variable objects
+ are created using '@' as frame specifier to -var-create. */
+bool
+varobj_floating_p (const struct varobj *var)
{
- return cplus_number_of_children (var);
+ return var->root->floating;
}
-static char *
-java_name_of_variable (struct varobj *parent)
+/* Implement the "value_is_changeable_p" varobj callback for most
+ languages. */
+
+bool
+varobj_default_value_is_changeable_p (const struct varobj *var)
{
- char *p, *name;
+ bool r;
+ struct type *type;
+
+ if (CPLUS_FAKE_CHILD (var))
+ return false;
- name = cplus_name_of_variable (parent);
- /* If the name has "-" in it, it is because we
- needed to escape periods in the name... */
- p = name;
+ type = varobj_get_value_type (var);
- while (*p != '\000')
+ switch (TYPE_CODE (type))
{
- if (*p == '-')
- *p = '.';
- p++;
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ case TYPE_CODE_ARRAY:
+ r = false;
+ break;
+
+ default:
+ r = true;
}
- return name;
+ return r;
}
-static char *
-java_name_of_child (struct varobj *parent, int index)
+/* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
+ with an arbitrary caller supplied DATA pointer. */
+
+void
+all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
{
- char *name, *p;
+ struct varobj_root *var_root, *var_root_next;
- name = cplus_name_of_child (parent, index);
- /* Escape any periods in the name... */
- p = name;
+ /* Iterate "safely" - handle if the callee deletes its passed VAROBJ. */
- while (*p != '\000')
+ for (var_root = rootlist; var_root != NULL; var_root = var_root_next)
{
- if (*p == '.')
- *p = '-';
- p++;
- }
-
- return name;
-}
-
-static char *
-java_path_expr_of_child (struct varobj *child)
-{
- return NULL;
-}
+ var_root_next = var_root->next;
-static struct value *
-java_value_of_root (struct varobj **var_handle)
-{
- return cplus_value_of_root (var_handle);
+ (*func) (var_root->rootvar, data);
+ }
}
-static struct value *
-java_value_of_child (struct varobj *parent, int index)
-{
- return cplus_value_of_child (parent, index);
-}
+/* Invalidate varobj VAR if it is tied to locals and re-create it if it is
+ defined on globals. It is a helper for varobj_invalidate.
-static struct type *
-java_type_of_child (struct varobj *parent, int index)
-{
- return cplus_type_of_child (parent, index);
-}
+ This function is called after changing the symbol file, in this case the
+ pointers to "struct type" stored by the varobj are no longer valid. All
+ varobj must be either re-evaluated, or marked as invalid here. */
-static char *
-java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
-{
- return cplus_value_of_variable (var, format);
-}
-\f
-extern void _initialize_varobj (void);
-void
-_initialize_varobj (void)
+static void
+varobj_invalidate_iter (struct varobj *var, void *unused)
{
- int sizeof_table = sizeof (struct vlist *) * VAROBJ_TABLE_SIZE;
-
- varobj_table = xmalloc (sizeof_table);
- memset (varobj_table, 0, sizeof_table);
+ /* global and floating var must be re-evaluated. */
+ if (var->root->floating || var->root->valid_block == NULL)
+ {
+ struct varobj *tmp_var;
- add_setshow_zinteger_cmd ("debugvarobj", class_maintenance,
- &varobjdebug, _("\
-Set varobj debugging."), _("\
-Show varobj debugging."), _("\
-When non-zero, varobj debugging is enabled."),
- NULL,
- show_varobjdebug,
- &setlist, &showlist);
+ /* Try to create a varobj with same expression. If we succeed
+ replace the old varobj, otherwise invalidate it. */
+ tmp_var = varobj_create (NULL, var->name.c_str (), (CORE_ADDR) 0,
+ USE_CURRENT_FRAME);
+ if (tmp_var != NULL)
+ {
+ tmp_var->obj_name = var->obj_name;
+ varobj_delete (var, 0);
+ install_variable (tmp_var);
+ }
+ else
+ var->root->is_valid = false;
+ }
+ else /* locals must be invalidated. */
+ var->root->is_valid = false;
}
/* Invalidate the varobjs that are tied to locals and re-create the ones that
are defined on globals.
Invalidated varobjs will be always printed in_scope="invalid". */
+
void
varobj_invalidate (void)
{
- struct varobj **all_rootvarobj;
- struct varobj **varp;
+ all_root_varobjs (varobj_invalidate_iter, NULL);
+}
+
+void
+_initialize_varobj (void)
+{
+ varobj_table = XCNEWVEC (struct vlist *, VAROBJ_TABLE_SIZE);
- if (varobj_list (&all_rootvarobj) > 0)
- {
- varp = all_rootvarobj;
- while (*varp != NULL)
- {
- /* Floating varobjs are reparsed on each stop, so we don't care if
- the presently parsed expression refers to something that's gone. */
- if ((*varp)->root->floating)
- continue;
-
- /* global var must be re-evaluated. */
- if ((*varp)->root->valid_block == NULL)
- {
- struct varobj *tmp_var;
-
- /* Try to create a varobj with same expression. If we succeed replace
- the old varobj, otherwise invalidate it. */
- tmp_var = varobj_create (NULL, (*varp)->name, (CORE_ADDR) 0, USE_CURRENT_FRAME);
- if (tmp_var != NULL)
- {
- tmp_var->obj_name = xstrdup ((*varp)->obj_name);
- varobj_delete (*varp, NULL, 0);
- install_variable (tmp_var);
- }
- else
- (*varp)->root->is_valid = 0;
- }
- else /* locals must be invalidated. */
- (*varp)->root->is_valid = 0;
-
- varp++;
- }
- xfree (all_rootvarobj);
- }
- return;
+ add_setshow_zuinteger_cmd ("varobj", class_maintenance,
+ &varobjdebug,
+ _("Set varobj debugging."),
+ _("Show varobj debugging."),
+ _("When non-zero, varobj debugging is enabled."),
+ NULL, show_varobjdebug,
+ &setdebuglist, &showdebuglist);
}
projects / deliverable / binutils-gdb.git / blobdiff