X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fvarobj.c;h=23a8bb3e5f216265928041d19973bdda5874d8b6;hb=c1299d67f5e87927ba19ac99524d238905b9c406;hp=30f1c38c59ccc467dad157989e6c3e1c210b4606;hpb=6abe1021c175b8dc8a1d5552a8b712aabccd52eb;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/varobj.c b/gdb/varobj.c index 30f1c38c59..23a8bb3e5f 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -412,7 +412,7 @@ find_frame_addr_in_frame_chain (CORE_ADDR frame_addr) frame = get_prev_frame (frame); if (frame == NULL) return NULL; - if (get_frame_base (frame) == frame_addr) + if (get_frame_base_address (frame) == frame_addr) return frame; } } @@ -441,7 +441,7 @@ varobj_create (char *objname, /* Allow creator to specify context of variable */ if ((type == USE_CURRENT_FRAME) || (type == USE_SELECTED_FRAME)) - fi = selected_frame; + fi = deprecated_selected_frame; else /* FIXME: cagney/2002-11-23: This code should be doing a lookup using the frame ID and not just the frame's @@ -487,8 +487,8 @@ varobj_create (char *objname, Since select_frame is so benign, just call it for all cases. */ if (fi != NULL) { - get_frame_id (fi, &var->root->frame); - old_fi = selected_frame; + var->root->frame = get_frame_id (fi); + old_fi = deprecated_selected_frame; select_frame (fi); } @@ -505,7 +505,7 @@ varobj_create (char *objname, else var->value = evaluate_type (var->root->exp); - var->type = VALUE_TYPE (var->value); + var->type = value_type (var->value); /* Set language info */ lang = variable_language (var); @@ -549,7 +549,7 @@ varobj_gen_name (void) /* generate a name for this object */ id++; - xasprintf (&obj_name, "var%d", id); + obj_name = xstrprintf ("var%d", id); return obj_name; } @@ -744,7 +744,7 @@ varobj_get_type (struct varobj *var) /* 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); + type_print (value_type (val), "", stb, -1); thetype = ui_file_xstrdup (stb, &length); do_cleanups (old_chain); @@ -898,7 +898,7 @@ varobj_update (struct varobj **varp, struct varobj ***changelist) /* Save the selected stack frame, since we will need to change it in order to evaluate expressions. */ - get_frame_id (selected_frame, &old_fid); + old_fid = get_frame_id (deprecated_selected_frame); /* Update the root variable. value_of_root can return NULL if the variable is no longer around, i.e. we stepped out of @@ -1254,7 +1254,7 @@ create_child (struct varobj *parent, int index, char *name) child->error = 1; child->parent = parent; child->root = parent->root; - xasprintf (&childs_name, "%s.%s", parent->obj_name, name); + childs_name = xstrprintf ("%s.%s", parent->obj_name, name); child->obj_name = childs_name; install_variable (child); @@ -1344,8 +1344,7 @@ new_root_variable (void) var->root->lang = NULL; var->root->exp = NULL; var->root->valid_block = NULL; - var->root->frame.base = 0; - var->root->frame.pc = 0; + var->root->frame = null_frame_id; var->root->use_selected_frame = 0; var->root->rootvar = NULL; @@ -1380,9 +1379,8 @@ make_cleanup_free_variable (struct varobj *var) return make_cleanup (do_free_variable_cleanup, var); } -/* This returns the type of the variable. This skips past typedefs - and returns the real type of the variable. It also dereferences - pointers and references. +/* This returns the type of the variable. It also skips past typedefs + to return the real type of the variable. NOTE: TYPE_TARGET_TYPE should NOT be used anywhere in this file except within get_target_type and get_type. */ @@ -1392,8 +1390,8 @@ get_type (struct varobj *var) struct type *type; type = var->type; - while (type != NULL && TYPE_CODE (type) == TYPE_CODE_TYPEDEF) - type = TYPE_TARGET_TYPE (type); + if (type != NULL) + type = check_typedef (type); return type; } @@ -1424,8 +1422,8 @@ get_target_type (struct type *type) if (type != NULL) { type = TYPE_TARGET_TYPE (type); - while (type != NULL && TYPE_CODE (type) == TYPE_CODE_TYPEDEF) - type = TYPE_TARGET_TYPE (type); + if (type != NULL) + type = check_typedef (type); } return type; @@ -1707,7 +1705,7 @@ type_of_child (struct varobj *var) /* If the child had no evaluation errors, var->value will be non-NULL and contain a valid type. */ if (var->value != NULL) - return VALUE_TYPE (var->value); + return value_type (var->value); /* Otherwise, we must compute the type. */ return (*var->root->lang->type_of_child) (var->parent, var->index); @@ -1839,7 +1837,7 @@ c_name_of_child (struct varobj *parent, int index) switch (TYPE_CODE (type)) { case TYPE_CODE_ARRAY: - xasprintf (&name, "%d", index); + name = xstrprintf ("%d", index); break; case TYPE_CODE_STRUCT: @@ -1858,7 +1856,7 @@ c_name_of_child (struct varobj *parent, int index) break; default: - xasprintf (&name, "*%s", parent->name); + name = xstrprintf ("*%s", parent->name); break; } break; @@ -2072,7 +2070,7 @@ c_value_of_variable (struct varobj *var) case TYPE_CODE_ARRAY: { char *number; - xasprintf (&number, "[%d]", var->num_children); + number = xstrprintf ("[%d]", var->num_children); return (number); } /* break; */ @@ -2095,7 +2093,7 @@ c_value_of_variable (struct varobj *var) if (VALUE_LAZY (var->value)) gdb_value_fetch_lazy (var->value); - val_print (VALUE_TYPE (var->value), + val_print (value_type (var->value), VALUE_CONTENTS_RAW (var->value), 0, VALUE_ADDRESS (var->value), stb, format_code[(int) var->format], 1, 0, 0); @@ -2380,8 +2378,8 @@ cplus_value_of_child (struct varobj *parent, int index) { struct value *temp = NULL; - if (TYPE_CODE (VALUE_TYPE (parent->value)) == TYPE_CODE_PTR - || TYPE_CODE (VALUE_TYPE (parent->value)) == TYPE_CODE_REF) + if (TYPE_CODE (value_type (parent->value)) == TYPE_CODE_PTR + || TYPE_CODE (value_type (parent->value)) == TYPE_CODE_REF) { if (!gdb_value_ind (parent->value, &temp)) return NULL; @@ -2560,7 +2558,7 @@ _initialize_varobj (void) varobj_table = xmalloc (sizeof_table); memset (varobj_table, 0, sizeof_table); - add_show_from_set (add_set_cmd ("debugvarobj", class_maintenance, var_zinteger, (char *) &varobjdebug, "Set varobj debugging.\n\ + deprecated_add_show_from_set (add_set_cmd ("debugvarobj", class_maintenance, var_zinteger, (char *) &varobjdebug, "Set varobj debugging.\n\ When non-zero, varobj debugging is enabled.", &setlist), &showlist); }