gdb/findvar.c - Issue 124383005: GDB 7.6.50

Unified Diff: gdb/findvar.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gdb/findvar.c

diff --git a/gdb/findvar.c b/gdb/findvar.c

index 66bcebee3486e8e4bd726b7431dfeaadcaf303f0..ec6afd61e343956b19ee5d1454212c444d21fa79 100644

--- a/gdb/findvar.c

+++ b/gdb/findvar.c

@@ -1,7 +1,6 @@

/* Find a variable's value in memory, for GDB, the GNU debugger.

- Foundation, Inc.

This file is part of GDB.

@@ -26,7 +25,7 @@

#include "gdbcore.h"

#include "inferior.h"

#include "target.h"

-#include "gdb_string.h"

+#include <string.h>

#include "gdb_assert.h"

#include "floatformat.h"

#include "symfile.h" /* for overlay functions */

@@ -263,13 +262,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;

- 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,25 +270,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_val = allocate_value (register_type (gdbarch, regnum));

- 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;

- set_value_optimized_out (reg_val, optim);

- 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;

}

@@ -368,17 +344,15 @@ address_to_signed_pointer (struct gdbarch *gdbarch, struct type *type,

int

symbol_read_needs_frame (struct symbol *sym)

{

+ if (SYMBOL_COMPUTED_OPS (sym) != NULL)

+ return SYMBOL_COMPUTED_OPS (sym)->read_needs_frame (sym);

switch (SYMBOL_CLASS (sym))

{

/* All cases listed explicitly so that gcc -Wall will detect it if

we failed to consider one. */

case LOC_COMPUTED:

- /* FIXME: cagney/2004-01-26: It should be possible to

- unconditionally call the SYMBOL_COMPUTED_OPS method when available.

- Unfortunately DWARF 2 stores the frame-base (instead of the

- function) location in a function's symbol. Oops! For the

- moment enable this when/where applicable. */

- return SYMBOL_COMPUTED_OPS (sym)->read_needs_frame (sym);

+ gdb_assert_not_reached (_("LOC_COMPUTED variable missing a method"));

case LOC_REGISTER:

case LOC_ARG:

@@ -417,6 +391,9 @@ struct minsym_lookup_data

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;

};

/* A callback function for gdbarch_iterate_over_objfiles_in_search_order.

@@ -432,6 +409,7 @@ minsym_lookup_iterator_cb (struct objfile *objfile, void *cb_data)

gdb_assert (data->result == 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);

@@ -446,7 +424,6 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

struct value *v;

struct type *type = SYMBOL_TYPE (var);

CORE_ADDR addr;

- int len;

/* Call check_typedef on our type to make sure that, if TYPE is

a TYPE_CODE_TYPEDEF, its length is set to the length of the target type

@@ -455,17 +432,18 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

set the returned value type description correctly. */

check_typedef (type);

- len = TYPE_LENGTH (type);

if (symbol_read_needs_frame (var))

gdb_assert (frame);

+ if (SYMBOL_COMPUTED_OPS (var) != NULL)

+ return SYMBOL_COMPUTED_OPS (var)->read_variable (var, frame);

switch (SYMBOL_CLASS (var))

{

case LOC_CONST:

/* Put the constant back in target format. */

v = allocate_value (type);

- store_signed_integer (value_contents_raw (v), len,

+ store_signed_integer (value_contents_raw (v), TYPE_LENGTH (type),

gdbarch_byte_order (get_type_arch (type)),

(LONGEST) SYMBOL_VALUE (var));

VALUE_LVAL (v) = not_lval;

@@ -478,7 +456,8 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

{

CORE_ADDR addr

= symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (var),

- SYMBOL_OBJ_SECTION (var));

+ SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var),

+ var));

store_typed_address (value_contents_raw (v), type, addr);

}

@@ -490,15 +469,16 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

case LOC_CONST_BYTES:

v = allocate_value (type);

- memcpy (value_contents_raw (v), SYMBOL_VALUE_BYTES (var), len);

+ memcpy (value_contents_raw (v), SYMBOL_VALUE_BYTES (var),

+ TYPE_LENGTH (type));

VALUE_LVAL (v) = not_lval;

return v;

case LOC_STATIC:

- v = allocate_value_lazy (type);

if (overlay_debugging)

addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (var),

- SYMBOL_OBJ_SECTION (var));

+ SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var),

+ var));

else

addr = SYMBOL_VALUE_ADDRESS (var);

break;

@@ -509,7 +489,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:

@@ -524,14 +503,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:

@@ -540,10 +517,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 (var));

+ (BLOCK_START (SYMBOL_BLOCK_VALUE (var)), SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (var),

+ var));

else

addr = BLOCK_START (SYMBOL_BLOCK_VALUE (var));

break;

@@ -566,7 +543,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

{

@@ -581,12 +557,7 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

break;

case LOC_COMPUTED:

- /* FIXME: cagney/2004-01-26: It should be possible to

- unconditionally call the SYMBOL_COMPUTED_OPS method when available.

- Unfortunately DWARF 2 stores the frame-base (instead of the

- function) location in a function's symbol. Oops! For the

- moment enable this when/where applicable. */

- return SYMBOL_COMPUTED_OPS (var)->read_variable (var, frame);

+ gdb_assert_not_reached (_("LOC_COMPUTED variable missing a method"));

case LOC_UNRESOLVED:

{

@@ -607,15 +578,15 @@ default_read_var_value (struct symbol *var, struct frame_info *frame)

error (_("No global symbol \"%s\"."), SYMBOL_LINKAGE_NAME (var));

if (overlay_debugging)

addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (msym),

- SYMBOL_OBJ_SECTION (msym));

+ SYMBOL_OBJ_SECTION (lookup_data.objfile,

+ msym));

else

addr = SYMBOL_VALUE_ADDRESS (msym);

- obj_section = SYMBOL_OBJ_SECTION (msym);

+ obj_section = SYMBOL_OBJ_SECTION (lookup_data.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;

@@ -628,8 +599,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;

}

@@ -677,7 +647,10 @@ default_value_from_register (struct type *type, int regnum,

/* VALUE must be an lval_register value. If regnum is the value's

associated register number, and len the length of the values type,

read one or more registers in FRAME, starting with register REGNUM,

- until we've read LEN bytes. */

+ until we've read LEN bytes.

+ If any of the registers we try to read are optimized out, then mark the

+ complete resulting value as optimized out. */

void

read_frame_register_value (struct value *value, struct frame_info *frame)

@@ -703,6 +676,12 @@ 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)

@@ -778,6 +757,15 @@ address_from_register (struct type *type, int regnum, struct frame_info *frame)

value = value_from_register (type, regnum, frame);

gdb_assert (value);

+ 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);

value_free (value);

« no previous file with comments | « gdb/findcmd.c ('k') | gdb/fork-child.c » ('j') | no next file with comments »