X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ffindvar.c;h=2079b4b2b183f14a2ff0b6027a25fdeba1b97bdb;hb=607685ecee1015d6c37e0d800d40453dc0aadc8c;hp=f586ce24efeb8d9b8ea725f47d15e3d7150c6734;hpb=7195e6f018c7928c8b7be37e56b4df2656402618;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/findvar.c b/gdb/findvar.c index f586ce24ef..2079b4b2b1 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -1,6 +1,6 @@ /* Find a variable's value in memory, for GDB, the GNU debugger. - Copyright (C) 1986-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -25,8 +25,6 @@ #include "gdbcore.h" #include "inferior.h" #include "target.h" -#include "gdb_string.h" -#include "gdb_assert.h" #include "floatformat.h" #include "symfile.h" /* for overlay functions */ #include "regcache.h" @@ -262,14 +260,7 @@ struct value * value_of_register (int regnum, struct frame_info *frame) { struct gdbarch *gdbarch = get_frame_arch (frame); - CORE_ADDR addr; - int optim; - int unavail; struct value *reg_val; - struct type *reg_type; - int realnum; - gdb_byte raw_buffer[MAX_REGISTER_SIZE]; - enum lval_type lval; /* User registers lie completely outside of the range of normal registers. Catch them early so that the target never sees them. */ @@ -277,28 +268,8 @@ value_of_register (int regnum, struct frame_info *frame) + gdbarch_num_pseudo_regs (gdbarch)) return value_of_user_reg (regnum, frame); - frame_register (frame, regnum, &optim, &unavail, - &lval, &addr, &realnum, raw_buffer); - - reg_type = register_type (gdbarch, regnum); - if (optim) - reg_val = allocate_optimized_out_value (reg_type); - else - reg_val = allocate_value (reg_type); - - if (!optim && !unavail) - memcpy (value_contents_raw (reg_val), raw_buffer, - register_size (gdbarch, regnum)); - else - memset (value_contents_raw (reg_val), 0, - register_size (gdbarch, regnum)); - - VALUE_LVAL (reg_val) = lval; - set_value_address (reg_val, addr); - VALUE_REGNUM (reg_val) = regnum; - if (unavail) - mark_value_bytes_unavailable (reg_val, 0, register_size (gdbarch, regnum)); - VALUE_FRAME_ID (reg_val) = get_frame_id (frame); + reg_val = value_of_register_lazy (frame, regnum); + value_fetch_lazy (reg_val); return reg_val; } @@ -417,10 +388,7 @@ struct minsym_lookup_data /* The field where the callback should store the minimal symbol if found. It should be initialized to NULL before the search is started. */ - struct minimal_symbol *result; - - /* The objfile in which the symbol was found. */ - struct objfile *objfile; + struct bound_minimal_symbol result; }; /* A callback function for gdbarch_iterate_over_objfiles_in_search_order. @@ -433,13 +401,12 @@ minsym_lookup_iterator_cb (struct objfile *objfile, void *cb_data) { struct minsym_lookup_data *data = (struct minsym_lookup_data *) cb_data; - gdb_assert (data->result == NULL); + gdb_assert (data->result.minsym == NULL); data->result = lookup_minimal_symbol (data->name, NULL, objfile); - data->objfile = objfile; /* The iterator should stop iff a match was found. */ - return (data->result != NULL); + return (data->result.minsym != NULL); } /* A default implementation for the "la_read_var_value" hook in @@ -468,7 +435,12 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) switch (SYMBOL_CLASS (var)) { case LOC_CONST: - /* Put the constant back in target format. */ + if (is_dynamic_type (type)) + { + /* Value is a constant byte-sequence and needs no memory access. */ + type = resolve_dynamic_type (type, NULL, /* Unused address. */ 0); + } + /* Put the constant back in target format. */ v = allocate_value (type); store_signed_integer (value_contents_raw (v), TYPE_LENGTH (type), gdbarch_byte_order (get_type_arch (type)), @@ -483,7 +455,7 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) { CORE_ADDR addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (var), - SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var), + SYMBOL_OBJ_SECTION (symbol_objfile (var), var)); store_typed_address (value_contents_raw (v), type, addr); @@ -495,6 +467,11 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) return v; case LOC_CONST_BYTES: + if (is_dynamic_type (type)) + { + /* Value is a constant byte-sequence and needs no memory access. */ + type = resolve_dynamic_type (type, NULL, /* Unused address. */ 0); + } v = allocate_value (type); memcpy (value_contents_raw (v), SYMBOL_VALUE_BYTES (var), TYPE_LENGTH (type)); @@ -502,10 +479,9 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) return v; case LOC_STATIC: - v = allocate_value_lazy (type); if (overlay_debugging) addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (var), - SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var), + SYMBOL_OBJ_SECTION (symbol_objfile (var), var)); else addr = SYMBOL_VALUE_ADDRESS (var); @@ -517,7 +493,6 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) error (_("Unknown argument list address for `%s'."), SYMBOL_PRINT_NAME (var)); addr += SYMBOL_VALUE (var); - v = allocate_value_lazy (type); break; case LOC_REF_ARG: @@ -532,14 +507,12 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) argref += SYMBOL_VALUE (var); ref = value_at (lookup_pointer_type (type), argref); addr = value_as_address (ref); - v = allocate_value_lazy (type); break; } case LOC_LOCAL: addr = get_frame_locals_address (frame); addr += SYMBOL_VALUE (var); - v = allocate_value_lazy (type); break; case LOC_TYPEDEF: @@ -548,11 +521,10 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) break; case LOC_BLOCK: - v = allocate_value_lazy (type); if (overlay_debugging) addr = symbol_overlayed_address - (BLOCK_START (SYMBOL_BLOCK_VALUE (var)), SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var), - var)); + (BLOCK_START (SYMBOL_BLOCK_VALUE (var)), + SYMBOL_OBJ_SECTION (symbol_objfile (var), var)); else addr = BLOCK_START (SYMBOL_BLOCK_VALUE (var)); break; @@ -575,7 +547,6 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) SYMBOL_PRINT_NAME (var)); addr = value_as_address (regval); - v = allocate_value_lazy (type); } else { @@ -602,25 +573,24 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) lookup_data.name = SYMBOL_LINKAGE_NAME (var); gdbarch_iterate_over_objfiles_in_search_order - (get_objfile_arch (SYMBOL_SYMTAB (var)->objfile), + (symbol_arch (var), minsym_lookup_iterator_cb, &lookup_data, - SYMBOL_SYMTAB (var)->objfile); - msym = lookup_data.result; + symbol_objfile (var)); + msym = lookup_data.result.minsym; if (msym == NULL) error (_("No global symbol \"%s\"."), SYMBOL_LINKAGE_NAME (var)); if (overlay_debugging) - addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (msym), - SYMBOL_OBJ_SECTION (lookup_data.objfile, - msym)); + addr = symbol_overlayed_address (BMSYMBOL_VALUE_ADDRESS (lookup_data.result), + MSYMBOL_OBJ_SECTION (lookup_data.result.objfile, + msym)); else - addr = SYMBOL_VALUE_ADDRESS (msym); + addr = BMSYMBOL_VALUE_ADDRESS (lookup_data.result); - obj_section = SYMBOL_OBJ_SECTION (lookup_data.objfile, msym); + obj_section = MSYMBOL_OBJ_SECTION (lookup_data.result.objfile, msym); if (obj_section && (obj_section->the_bfd_section->flags & SEC_THREAD_LOCAL) != 0) addr = target_translate_tls_address (obj_section->objfile, addr); - v = allocate_value_lazy (type); } break; @@ -633,8 +603,7 @@ default_read_var_value (struct symbol *var, struct frame_info *frame) break; } - VALUE_LVAL (v) = lval_memory; - set_value_address (v, addr); + v = value_at_lazy (type, addr); return v; } @@ -654,15 +623,14 @@ read_var_value (struct symbol *var, struct frame_info *frame) /* Install default attributes for register values. */ struct value * -default_value_from_register (struct type *type, int regnum, - struct frame_info *frame) +default_value_from_register (struct gdbarch *gdbarch, struct type *type, + int regnum, struct frame_id frame_id) { - struct gdbarch *gdbarch = get_frame_arch (frame); int len = TYPE_LENGTH (type); struct value *value = allocate_value (type); VALUE_LVAL (value) = lval_register; - VALUE_FRAME_ID (value) = get_frame_id (frame); + VALUE_FRAME_ID (value) = frame_id; VALUE_REGNUM (value) = regnum; /* Any structure stored in more than one register will always be @@ -711,12 +679,6 @@ read_frame_register_value (struct value *value, struct frame_info *frame) struct value *regval = get_frame_register_value (frame, regnum); int reg_len = TYPE_LENGTH (value_type (regval)) - reg_offset; - if (value_optimized_out (regval)) - { - set_value_optimized_out (value, 1); - break; - } - /* If the register length is larger than the number of bytes remaining to copy, then only copy the appropriate bytes. */ if (reg_len > len) @@ -762,7 +724,7 @@ value_from_register (struct type *type, int regnum, struct frame_info *frame) if (!ok) { if (optim) - set_value_optimized_out (v, 1); + mark_value_bytes_optimized_out (v, 0, TYPE_LENGTH (type)); if (unavail) mark_value_bytes_unavailable (v, 0, TYPE_LENGTH (type)); } @@ -770,7 +732,8 @@ value_from_register (struct type *type, int regnum, struct frame_info *frame) else { /* Construct the value. */ - v = gdbarch_value_from_register (gdbarch, type, regnum, frame); + v = gdbarch_value_from_register (gdbarch, type, + regnum, get_frame_id (frame)); /* Get the data. */ read_frame_register_value (v, frame); @@ -779,18 +742,56 @@ value_from_register (struct type *type, int regnum, struct frame_info *frame) return v; } -/* Return contents of register REGNUM in frame FRAME as address, - interpreted as value of type TYPE. Will abort if register - value is not available. */ +/* Return contents of register REGNUM in frame FRAME as address. + Will abort if register value is not available. */ CORE_ADDR -address_from_register (struct type *type, int regnum, struct frame_info *frame) +address_from_register (int regnum, struct frame_info *frame) { + struct gdbarch *gdbarch = get_frame_arch (frame); + struct type *type = builtin_type (gdbarch)->builtin_data_ptr; struct value *value; CORE_ADDR result; - value = value_from_register (type, regnum, frame); - gdb_assert (value); + /* This routine may be called during early unwinding, at a time + where the ID of FRAME is not yet known. Calling value_from_register + would therefore abort in get_frame_id. However, since we only need + a temporary value that is never used as lvalue, we actually do not + really need to set its VALUE_FRAME_ID. Therefore, we re-implement + the core of value_from_register, but use the null_frame_id. */ + + /* Some targets require a special conversion routine even for plain + pointer types. Avoid constructing a value object in those cases. */ + if (gdbarch_convert_register_p (gdbarch, regnum, type)) + { + gdb_byte *buf = alloca (TYPE_LENGTH (type)); + int optim, unavail, ok; + + ok = gdbarch_register_to_value (gdbarch, frame, regnum, type, + buf, &optim, &unavail); + if (!ok) + { + /* This function is used while computing a location expression. + Complain about the value being optimized out, rather than + letting value_as_address complain about some random register + the expression depends on not being saved. */ + error_value_optimized_out (); + } + + return unpack_long (type, buf); + } + + value = gdbarch_value_from_register (gdbarch, type, regnum, null_frame_id); + read_frame_register_value (value, frame); + + if (value_optimized_out (value)) + { + /* This function is used while computing a location expression. + Complain about the value being optimized out, rather than + letting value_as_address complain about some random register + the expression depends on not being saved. */ + error_value_optimized_out (); + } result = value_as_address (value); release_value (value);