/* Implementation of the GDB variable objects API.
- Copyright 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1999, 2000, 2001 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
#include "value.h"
#include "expression.h"
#include "frame.h"
-#include "valprint.h"
#include "language.h"
#include "wrapper.h"
#include "gdbcmd.h"
/* Pointer to the varobj hash table (built at run time) */
static struct vlist **varobj_table;
-#if defined(FREEIF)
-#undef FREEIF
-#endif
-#define FREEIF(x) if (x != NULL) free((char *) (x))
-
/* Is the variable X one of our "fake" children? */
#define CPLUS_FAKE_CHILD(x) \
((x) != NULL && (x)->type == NULL && (x)->value == NULL)
enum varobj_type type)
{
struct varobj *var;
- struct frame_info *fi, *old_fi;
+ struct frame_info *fi;
+ struct frame_info *old_fi = NULL;
struct block *block;
struct cleanup *old_chain;
value_ptr temp;
input_radix = 10; /* ALWAYS reset to decimal temporarily */
- /* FIXME: Callee may longjump */
- exp = parse_exp_1 (&s, 0, 0);
+ if (!gdb_parse_exp_1 (&s, 0, 0, &exp))
+ /* We cannot proceed without a well-formed expression. */
+ return 0;
if (!gdb_evaluate_expression (exp, &value))
{
/* We cannot proceed without a valid expression. */
- FREEIF (exp);
+ xfree (exp);
return 0;
}
}
VALUE_ADDRESS (temp) += offset;
- val = value_assign (temp, value);
+ if (!gdb_value_assign (temp, value, &val))
+ return 0;
VALUE_ADDRESS (val) -= offset;
value_free (var->value);
release_value (val);
int error2;
struct varobj *v;
struct varobj **cv;
- struct varobj **templist;
+ struct varobj **templist = NULL;
value_ptr new;
struct vstack *stack = NULL;
struct vstack *result = NULL;
/* Initialize a stack for temporary results */
vpush (&result, NULL);
- if (type_changed || !my_value_equal (var->value, new, &error2))
+ /* If this is a "use_selected_frame" varobj, and its type has changed,
+ them note that it's changed. */
+ if (type_changed)
{
- /* Note that it's changed There a couple of exceptions here,
- though. We don't want some types to be reported as
- "changed". The exception to this is if this is a
- "use_selected_frame" varobj, and its type has changed. */
- if (type_changed || type_changeable (var))
- {
- vpush (&result, var);
- changed++;
- }
+ vpush (&result, var);
+ changed++;
+ }
+ /* If values are not equal, note that it's changed.
+ There a couple of exceptions here, though.
+ We don't want some types to be reported as "changed". */
+ else if (type_changeable (var) && !my_value_equal (var->value, new, &error2))
+ {
+ vpush (&result, var);
+ changed++;
+ /* error2 replaces var->error since this new value
+ WILL replace the old one. */
+ var->error = error2;
}
- /* error2 replaces var->error since this new value
- WILL replace the old one. */
- var->error = error2;
/* We must always keep around the new value for this root
variable expression, or we lose the updated children! */
*/
static int
-delete_variable (resultp, var, only_children_p)
- struct cpstack **resultp;
- struct varobj *var;
- int only_children_p;
+delete_variable (struct cpstack **resultp, struct varobj *var,
+ int only_children_p)
{
int delcount = 0;
and the parent is not removed we dump core. It must be always
initially called with remove_from_parent_p set */
static void
-delete_variable_1 (resultp, delcountp, var,
- only_children_p, remove_from_parent_p)
- struct cpstack **resultp;
- int *delcountp;
- struct varobj *var;
- int only_children_p;
- int remove_from_parent_p;
+delete_variable_1 (struct cpstack **resultp, int *delcountp, struct varobj *var,
+ int only_children_p, int remove_from_parent_p)
{
struct varobj_child *vc;
struct varobj_child *next;
vc->child->parent = NULL;
delete_variable_1 (resultp, delcountp, vc->child, 0, only_children_p);
next = vc->next;
- free (vc);
+ xfree (vc);
}
/* if we were called to delete only the children we are done here */
yet been installed, don't report it, it belongs to the caller... */
if (var->obj_name != NULL)
{
- cppush (resultp, strdup (var->obj_name));
+ cppush (resultp, xstrdup (var->obj_name));
*delcountp = *delcountp + 1;
}
/* Install the given variable VAR with the object name VAR->OBJ_NAME. */
static int
-install_variable (var)
- struct varobj *var;
+install_variable (struct varobj *var)
{
struct vlist *cv;
struct vlist *newvl;
/* Unistall the object VAR. */
static void
-uninstall_variable (var)
- struct varobj *var;
+uninstall_variable (struct varobj *var)
{
struct vlist *cv;
struct vlist *prev;
else
prev->next = cv->next;
- free (cv);
+ xfree (cv);
/* If root, remove varobj from root list */
if (var->root->rootvar == var)
/* Does a child with the name NAME exist in VAR? If so, return its data.
If not, return NULL. */
static struct varobj *
-child_exists (var, name)
- struct varobj *var; /* Parent */
- char *name; /* name of child */
+child_exists (struct varobj *var, char *name)
{
struct varobj_child *vc;
/* Create and install a child of the parent of the given name */
static struct varobj *
-create_child (parent, index, name)
- struct varobj *parent;
- int index;
- char *name;
+create_child (struct varobj *parent, int index, char *name)
{
struct varobj *child;
char *childs_name;
/* FIXME: This should be a generic add to list */
/* Save CHILD in the PARENT's data. */
static void
-save_child_in_parent (parent, child)
- struct varobj *parent;
- struct varobj *child;
+save_child_in_parent (struct varobj *parent, struct varobj *child)
{
struct varobj_child *vc;
/* FIXME: This should be a generic remove from list */
/* Remove the CHILD from the PARENT's list of children. */
static void
-remove_child_from_parent (parent, child)
- struct varobj *parent;
- struct varobj *child;
+remove_child_from_parent (struct varobj *parent, struct varobj *child)
{
struct varobj_child *vc, *prev;
/* Free any allocated memory associated with VAR. */
static void
-free_variable (var)
- struct varobj *var;
+free_variable (struct varobj *var)
{
/* Free the expression if this is a root variable. */
if (var->root->rootvar == var)
{
free_current_contents ((char **) &var->root->exp);
- FREEIF (var->root);
+ xfree (var->root);
}
- FREEIF (var->name);
- FREEIF (var->obj_name);
- FREEIF (var);
+ xfree (var->name);
+ xfree (var->obj_name);
+ xfree (var);
}
static void
and returns the real type of the variable. It also dereferences
pointers and references. */
static struct type *
-get_type (var)
- struct varobj *var;
+get_type (struct varobj *var)
{
struct type *type;
type = var->type;
/* This returns the type of the variable, dereferencing pointers, too. */
static struct type *
-get_type_deref (var)
- struct varobj *var;
+get_type_deref (struct varobj *var)
{
struct type *type;
/* This returns the target type (or NULL) of TYPE, also skipping
past typedefs, just like get_type (). */
static struct type *
-get_target_type (type)
- struct type *type;
+get_target_type (struct type *type)
{
if (type != 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 (var)
- struct varobj *var;
+variable_default_display (struct varobj *var)
{
return FORMAT_NATURAL;
}
one is "safe" -- it NEVER longjmps. It determines if the VAR's
value is the same as VAL2. */
static int
-my_value_equal (val1, val2, error2)
- value_ptr val1;
- value_ptr val2;
- int *error2;
+my_value_equal (value_ptr val1, value_ptr val2, int *error2)
{
int r, err1, err2;
/* FIXME: The following should be generic for any pointer */
static void
-vpush (pstack, var)
- struct vstack **pstack;
- struct varobj *var;
+vpush (struct vstack **pstack, struct varobj *var)
{
struct vstack *s;
/* FIXME: The following should be generic for any pointer */
static struct varobj *
-vpop (pstack)
- struct vstack **pstack;
+vpop (struct vstack **pstack)
{
struct vstack *s;
struct varobj *v;
s = *pstack;
v = s->var;
*pstack = (*pstack)->next;
- free (s);
+ xfree (s);
return v;
}
/* FIXME: The following should be generic for any pointer */
static void
-cppush (pstack, name)
- struct cpstack **pstack;
- char *name;
+cppush (struct cpstack **pstack, char *name)
{
struct cpstack *s;
/* FIXME: The following should be generic for any pointer */
static char *
-cppop (pstack)
- struct cpstack **pstack;
+cppop (struct cpstack **pstack)
{
struct cpstack *s;
char *v;
s = *pstack;
v = s->name;
*pstack = (*pstack)->next;
- free (s);
+ xfree (s);
return v;
}
/* Get the language of variable VAR. */
static enum varobj_languages
-variable_language (var)
- struct varobj *var;
+variable_language (struct varobj *var)
{
enum varobj_languages lang;
is the number of children that the user will see in the variable
display. */
static int
-number_of_children (var)
- struct varobj *var;
+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 (var)
- struct varobj *var;
+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 (var, index)
- struct varobj *var;
- int index;
+name_of_child (struct varobj *var, int index)
{
return (*var->root->lang->name_of_child) (var, index);
}
On return, TYPE_CHANGED will be 1 if the type has changed, and
0 otherwise. */
static value_ptr
-value_of_root (var_handle, type_changed)
- struct varobj ** var_handle;
- int *type_changed;
+value_of_root (struct varobj **var_handle, int *type_changed)
{
struct varobj *var;
/* What is the value_ptr for the INDEX'th child of PARENT? */
static value_ptr
-value_of_child (parent, index)
- struct varobj *parent;
- int index;
+value_of_child (struct varobj *parent, int index)
{
value_ptr value;
/* What is the type of VAR? */
static struct type *
-type_of_child (var)
- struct varobj *var;
+type_of_child (struct varobj *var)
{
/* If the child had no evaluation errors, var->value
/* Is this variable editable? Use the variable's type to make
this determination. */
static int
-variable_editable (var)
- struct varobj *var;
+variable_editable (struct varobj *var)
{
return (*var->root->lang->variable_editable) (var);
}
/* GDB already has a command called "value_of_variable". Sigh. */
static char *
-my_value_of_variable (var)
- struct varobj *var;
+my_value_of_variable (struct varobj *var)
{
return (*var->root->lang->value_of_variable) (var);
}
some variable's values never change. For example,
struct and unions never change values. */
static int
-type_changeable (var)
- struct varobj *var;
+type_changeable (struct varobj *var)
{
int r;
struct type *type;
{
case TYPE_CODE_STRUCT:
case TYPE_CODE_UNION:
+ case TYPE_CODE_ARRAY:
r = 0;
break;
/* C */
static int
-c_number_of_children (var)
- struct varobj *var;
+c_number_of_children (struct varobj *var)
{
struct type *type;
struct type *target;
case TYPE_CODE_PTR:
/* This is where things get compilcated. All pointers have one child.
Except, of course, for struct and union ptr, which we automagically
- dereference for the user and function ptrs, which have no children. */
+ dereference for the user and function ptrs, which have no children.
+ We also don't dereference 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" */
+
switch (TYPE_CODE (target))
{
case TYPE_CODE_STRUCT:
break;
case TYPE_CODE_FUNC:
+ case TYPE_CODE_VOID:
children = 0;
break;
default:
- /* Don't dereference char* or void*. */
- if (TYPE_NAME (target) != NULL
- && (STREQ (TYPE_NAME (target), "char")
- || STREQ (TYPE_NAME (target), "void")))
- children = 0;
- else
- children = 1;
+ children = 1;
}
break;
}
static char *
-c_name_of_variable (parent)
- struct varobj *parent;
+c_name_of_variable (struct varobj *parent)
{
return savestring (parent->name, strlen (parent->name));
}
static char *
-c_name_of_child (parent, index)
- struct varobj *parent;
- int index;
+c_name_of_child (struct varobj *parent, int index)
{
struct type *type;
struct type *target;
}
static value_ptr
-c_value_of_root (var_handle)
- struct varobj **var_handle;
+c_value_of_root (struct varobj **var_handle)
{
value_ptr new_val;
struct varobj *var = *var_handle;
}
static value_ptr
-c_value_of_child (parent, index)
- struct varobj *parent;
- int index;
+c_value_of_child (struct varobj *parent, int index)
{
value_ptr value, temp, indval;
struct type *type, *target;
}
static struct type *
-c_type_of_child (parent, index)
- struct varobj *parent;
- int index;
+c_type_of_child (struct varobj *parent, int index)
{
struct type *type;
char *name = name_of_child (parent, index);
}
static int
-c_variable_editable (var)
- struct varobj *var;
+c_variable_editable (struct varobj *var)
{
switch (TYPE_CODE (get_type (var)))
{
}
static char *
-c_value_of_variable (var)
- struct varobj *var;
+c_value_of_variable (struct varobj *var)
{
struct type *type;
value_ptr val;
/* C++ */
static int
-cplus_number_of_children (var)
- struct varobj *var;
+cplus_number_of_children (struct varobj *var)
{
struct type *type;
int children, dont_know;
That means we need to descend into all baseclasses and find out
how many are there, too. */
static void
-cplus_class_num_children (type, children)
- struct type *type;
- int children[3];
+cplus_class_num_children (struct type *type, int children[3])
{
int i;
}
static char *
-cplus_name_of_variable (parent)
- struct varobj *parent;
+cplus_name_of_variable (struct varobj *parent)
{
return c_name_of_variable (parent);
}
static char *
-cplus_name_of_child (parent, index)
- struct varobj *parent;
- int index;
+cplus_name_of_child (struct varobj *parent, int index)
{
char *name;
struct type *type;
}
static value_ptr
-cplus_value_of_root (var_handle)
- struct varobj **var_handle;
+cplus_value_of_root (struct varobj **var_handle)
{
return c_value_of_root (var_handle);
}
static value_ptr
-cplus_value_of_child (parent, index)
- struct varobj *parent;
- int index;
+cplus_value_of_child (struct varobj *parent, int index)
{
struct type *type;
value_ptr value;
}
static struct type *
-cplus_type_of_child (parent, index)
- struct varobj *parent;
- int index;
+cplus_type_of_child (struct varobj *parent, int index)
{
struct type *type, *t;
}
static int
-cplus_variable_editable (var)
- struct varobj *var;
+cplus_variable_editable (struct varobj *var)
{
if (CPLUS_FAKE_CHILD (var))
return 0;
}
static char *
-cplus_value_of_variable (var)
- struct varobj *var;
+cplus_value_of_variable (struct varobj *var)
{
/* If we have one of our special types, don't print out
/* Java */
static int
-java_number_of_children (var)
- struct varobj *var;
+java_number_of_children (struct varobj *var)
{
return cplus_number_of_children (var);
}
static char *
-java_name_of_variable (parent)
- struct varobj *parent;
+java_name_of_variable (struct varobj *parent)
{
char *p, *name;
}
static char *
-java_name_of_child (parent, index)
- struct varobj *parent;
- int index;
+java_name_of_child (struct varobj *parent, int index)
{
char *name, *p;
}
static value_ptr
-java_value_of_root (var_handle)
- struct varobj **var_handle;
+java_value_of_root (struct varobj **var_handle)
{
return cplus_value_of_root (var_handle);
}
static value_ptr
-java_value_of_child (parent, index)
- struct varobj *parent;
- int index;
+java_value_of_child (struct varobj *parent, int index)
{
return cplus_value_of_child (parent, index);
}
static struct type *
-java_type_of_child (parent, index)
- struct varobj *parent;
- int index;
+java_type_of_child (struct varobj *parent, int index)
{
return cplus_type_of_child (parent, index);
}
static int
-java_variable_editable (var)
- struct varobj *var;
+java_variable_editable (struct varobj *var)
{
return cplus_variable_editable (var);
}
static char *
-java_value_of_variable (var)
- struct varobj *var;
+java_value_of_variable (struct varobj *var)
{
return cplus_value_of_variable (var);
}
projects / deliverable / binutils-gdb.git / blobdiff