X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ffindvar.c;h=2b361efeda364ae1f2548beac49dde0b21d41afa;hb=4035a145a4af1e306af8a192b18662372e92a4b1;hp=980bb57880eb35da1713ac25c2fcd45884218b1b;hpb=66140c26166febde29e6e7f2001674a930967545;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/findvar.c b/gdb/findvar.c index 980bb57880..2b361efeda 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -1,13 +1,14 @@ /* Find a variable's value in memory, for GDB, the GNU debugger. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007, 2008, 2009, + 2010, 2011 Free Software Foundation, Inc. This file is part of GDB. 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,9 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "symtab.h" @@ -33,10 +32,13 @@ #include "floatformat.h" #include "symfile.h" /* for overlay functions */ #include "regcache.h" -#include "builtin-regs.h" +#include "user-regs.h" +#include "block.h" +#include "objfiles.h" -/* Basic byte-swapping routines. GDB has needed these for a long time... - All extract a target-format integer at ADDR which is LEN bytes long. */ +/* Basic byte-swapping routines. All 'extract' functions return a + host-format integer from a target-format integer at ADDR which is + LEN bytes long. */ #if TARGET_CHAR_BIT != 8 || HOST_CHAR_BIT != 8 /* 8 bit characters are a pretty safe assumption these days, so we @@ -47,7 +49,8 @@ you lose #endif LONGEST -extract_signed_integer (const void *addr, int len) +extract_signed_integer (const gdb_byte *addr, int len, + enum bfd_endian byte_order) { LONGEST retval; const unsigned char *p; @@ -55,13 +58,13 @@ extract_signed_integer (const void *addr, int len) const unsigned char *endaddr = startaddr + len; if (len > (int) sizeof (LONGEST)) - error ("\ -That operation is not available on integers of more than %d bytes.", + error (_("\ +That operation is not available on integers of more than %d bytes."), (int) sizeof (LONGEST)); /* Start at the most significant end of the integer, and work towards the least significant. */ - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (byte_order == BFD_ENDIAN_BIG) { p = startaddr; /* Do the sign extension once at the start. */ @@ -81,7 +84,8 @@ That operation is not available on integers of more than %d bytes.", } ULONGEST -extract_unsigned_integer (const void *addr, int len) +extract_unsigned_integer (const gdb_byte *addr, int len, + enum bfd_endian byte_order) { ULONGEST retval; const unsigned char *p; @@ -89,14 +93,14 @@ extract_unsigned_integer (const void *addr, int len) const unsigned char *endaddr = startaddr + len; if (len > (int) sizeof (ULONGEST)) - error ("\ -That operation is not available on integers of more than %d bytes.", + error (_("\ +That operation is not available on integers of more than %d bytes."), (int) sizeof (ULONGEST)); /* Start at the most significant end of the integer, and work towards the least significant. */ retval = 0; - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (byte_order == BFD_ENDIAN_BIG) { for (p = startaddr; p < endaddr; ++p) retval = (retval << 8) | *p; @@ -115,16 +119,18 @@ That operation is not available on integers of more than %d bytes.", function returns 1 and sets *PVAL. Otherwise it returns 0. */ int -extract_long_unsigned_integer (const void *addr, int orig_len, LONGEST *pval) +extract_long_unsigned_integer (const gdb_byte *addr, int orig_len, + enum bfd_endian byte_order, LONGEST *pval) { - char *p, *first_addr; + const gdb_byte *p; + const gdb_byte *first_addr; int len; len = orig_len; - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (byte_order == BFD_ENDIAN_BIG) { - for (p = (char *) addr; - len > (int) sizeof (LONGEST) && p < (char *) addr + orig_len; + for (p = addr; + len > (int) sizeof (LONGEST) && p < addr + orig_len; p++) { if (*p == 0) @@ -136,9 +142,9 @@ extract_long_unsigned_integer (const void *addr, int orig_len, LONGEST *pval) } else { - first_addr = (char *) addr; - for (p = (char *) addr + orig_len - 1; - len > (int) sizeof (LONGEST) && p >= (char *) addr; + first_addr = addr; + for (p = addr + orig_len - 1; + len > (int) sizeof (LONGEST) && p >= addr; p--) { if (*p == 0) @@ -151,7 +157,8 @@ extract_long_unsigned_integer (const void *addr, int orig_len, LONGEST *pval) if (len <= (int) sizeof (LONGEST)) { *pval = (LONGEST) extract_unsigned_integer (first_addr, - sizeof (LONGEST)); + sizeof (LONGEST), + byte_order); return 1; } @@ -159,53 +166,34 @@ extract_long_unsigned_integer (const void *addr, int orig_len, LONGEST *pval) } -/* Treat the LEN bytes at ADDR as a target-format address, and return - that address. ADDR is a buffer in the GDB process, not in the - inferior. - - This function should only be used by target-specific code. It - assumes that a pointer has the same representation as that thing's - address represented as an integer. Some machines use word - addresses, or similarly munged things, for certain types of - pointers, so that assumption doesn't hold everywhere. - - Common code should use extract_typed_address instead, or something - else based on POINTER_TO_ADDRESS. */ - -CORE_ADDR -extract_address (const void *addr, int len) -{ - /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure - whether we want this to be true eventually. */ - return (CORE_ADDR) extract_unsigned_integer (addr, len); -} - - /* Treat the bytes at BUF as a pointer of type TYPE, and return the address it represents. */ CORE_ADDR -extract_typed_address (const void *buf, struct type *type) +extract_typed_address (const gdb_byte *buf, struct type *type) { if (TYPE_CODE (type) != TYPE_CODE_PTR && TYPE_CODE (type) != TYPE_CODE_REF) internal_error (__FILE__, __LINE__, - "extract_typed_address: " - "type is not a pointer or reference"); + _("extract_typed_address: " + "type is not a pointer or reference")); - return POINTER_TO_ADDRESS (type, buf); + return gdbarch_pointer_to_address (get_type_arch (type), type, buf); } +/* All 'store' functions accept a host-format integer and store a + target-format integer at ADDR which is LEN bytes long. */ void -store_signed_integer (void *addr, int len, LONGEST val) +store_signed_integer (gdb_byte *addr, int len, + enum bfd_endian byte_order, LONGEST val) { - unsigned char *p; - unsigned char *startaddr = (unsigned char *) addr; - unsigned char *endaddr = startaddr + len; + gdb_byte *p; + gdb_byte *startaddr = addr; + gdb_byte *endaddr = startaddr + len; /* Start at the least significant end of the integer, and work towards the most significant. */ - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (byte_order == BFD_ENDIAN_BIG) { for (p = endaddr - 1; p >= startaddr; --p) { @@ -224,7 +212,8 @@ store_signed_integer (void *addr, int len, LONGEST val) } void -store_unsigned_integer (void *addr, int len, ULONGEST val) +store_unsigned_integer (gdb_byte *addr, int len, + enum bfd_endian byte_order, ULONGEST val) { unsigned char *p; unsigned char *startaddr = (unsigned char *) addr; @@ -232,7 +221,7 @@ store_unsigned_integer (void *addr, int len, ULONGEST val) /* Start at the least significant end of the integer, and work towards the most significant. */ - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (byte_order == BFD_ENDIAN_BIG) { for (p = endaddr - 1; p >= startaddr; --p) { @@ -250,126 +239,127 @@ store_unsigned_integer (void *addr, int len, ULONGEST val) } } -/* Store the address VAL as a LEN-byte value in target byte order at - ADDR. ADDR is a buffer in the GDB process, not in the inferior. - - This function should only be used by target-specific code. It - assumes that a pointer has the same representation as that thing's - address represented as an integer. Some machines use word - addresses, or similarly munged things, for certain types of - pointers, so that assumption doesn't hold everywhere. - - Common code should use store_typed_address instead, or something else - based on ADDRESS_TO_POINTER. */ -void -store_address (void *addr, int len, LONGEST val) -{ - store_unsigned_integer (addr, len, val); -} - - /* Store the address ADDR as a pointer of type TYPE at BUF, in target form. */ void -store_typed_address (void *buf, struct type *type, CORE_ADDR addr) +store_typed_address (gdb_byte *buf, struct type *type, CORE_ADDR addr) { if (TYPE_CODE (type) != TYPE_CODE_PTR && TYPE_CODE (type) != TYPE_CODE_REF) internal_error (__FILE__, __LINE__, - "store_typed_address: " - "type is not a pointer or reference"); + _("store_typed_address: " + "type is not a pointer or reference")); - ADDRESS_TO_POINTER (type, buf, addr); + gdbarch_address_to_pointer (get_type_arch (type), type, buf, addr); } /* Return a `value' with the contents of (virtual or cooked) register REGNUM as found in the specified FRAME. The register's type is - determined by REGISTER_VIRTUAL_TYPE. - - NOTE: returns NULL if register value is not available. Caller will - check return value or die! */ + determined by register_type(). */ 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; - char *raw_buffer = (char*) alloca (MAX_REGISTER_RAW_SIZE); + int realnum; + gdb_byte raw_buffer[MAX_REGISTER_SIZE]; enum lval_type lval; - /* Builtin registers lie completly outside of the range of normal + /* User registers lie completely outside of the range of normal registers. Catch them early so that the target never sees them. */ - if (regnum >= NUM_REGS + NUM_PSEUDO_REGS) - return value_of_builtin_reg (regnum, deprecated_selected_frame); + if (regnum >= gdbarch_num_regs (gdbarch) + + gdbarch_num_pseudo_regs (gdbarch)) + return value_of_user_reg (regnum, frame); - get_saved_register (raw_buffer, &optim, &addr, - frame, regnum, &lval); + frame_register (frame, regnum, &optim, &unavail, + &lval, &addr, &realnum, raw_buffer); - /* FIXME: cagney/2002-05-15: This test is just bogus. + reg_val = allocate_value (register_type (gdbarch, regnum)); - It indicates that the target failed to supply a value for a - register because it was "not available" at this time. Problem - is, the target still has the register and so get saved_register() - may be returning a value saved on the stack. */ + 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)); - if (register_cached (regnum) < 0) - return NULL; /* register value not available */ + 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); + return reg_val; +} - reg_val = allocate_value (REGISTER_VIRTUAL_TYPE (regnum)); +/* Return a `value' with the contents of (virtual or cooked) register + REGNUM as found in the specified FRAME. The register's type is + determined by register_type(). The value is not fetched. */ - /* Convert raw data to virtual format if necessary. */ +struct value * +value_of_register_lazy (struct frame_info *frame, int regnum) +{ + struct gdbarch *gdbarch = get_frame_arch (frame); + struct value *reg_val; - if (REGISTER_CONVERTIBLE (regnum)) - { - REGISTER_CONVERT_TO_VIRTUAL (regnum, REGISTER_VIRTUAL_TYPE (regnum), - raw_buffer, VALUE_CONTENTS_RAW (reg_val)); - } - else if (REGISTER_RAW_SIZE (regnum) == REGISTER_VIRTUAL_SIZE (regnum)) - memcpy (VALUE_CONTENTS_RAW (reg_val), raw_buffer, - REGISTER_RAW_SIZE (regnum)); - else - internal_error (__FILE__, __LINE__, - "Register \"%s\" (%d) has conflicting raw (%d) and virtual (%d) size", - REGISTER_NAME (regnum), - regnum, - REGISTER_RAW_SIZE (regnum), - REGISTER_VIRTUAL_SIZE (regnum)); - VALUE_LVAL (reg_val) = lval; - VALUE_ADDRESS (reg_val) = addr; - VALUE_REGNO (reg_val) = regnum; - VALUE_OPTIMIZED_OUT (reg_val) = optim; + gdb_assert (regnum < (gdbarch_num_regs (gdbarch) + + gdbarch_num_pseudo_regs (gdbarch))); + + /* We should have a valid (i.e. non-sentinel) frame. */ + gdb_assert (frame_id_p (get_frame_id (frame))); + + reg_val = allocate_value_lazy (register_type (gdbarch, regnum)); + VALUE_LVAL (reg_val) = lval_register; + VALUE_REGNUM (reg_val) = regnum; + VALUE_FRAME_ID (reg_val) = get_frame_id (frame); return reg_val; } /* Given a pointer of type TYPE in target form in BUF, return the address it represents. */ CORE_ADDR -unsigned_pointer_to_address (struct type *type, const void *buf) +unsigned_pointer_to_address (struct gdbarch *gdbarch, + struct type *type, const gdb_byte *buf) { - return extract_address (buf, TYPE_LENGTH (type)); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + + return extract_unsigned_integer (buf, TYPE_LENGTH (type), byte_order); } CORE_ADDR -signed_pointer_to_address (struct type *type, const void *buf) +signed_pointer_to_address (struct gdbarch *gdbarch, + struct type *type, const gdb_byte *buf) { - return extract_signed_integer (buf, TYPE_LENGTH (type)); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + + return extract_signed_integer (buf, TYPE_LENGTH (type), byte_order); } /* Given an address, store it as a pointer of type TYPE in target format in BUF. */ void -unsigned_address_to_pointer (struct type *type, void *buf, CORE_ADDR addr) +unsigned_address_to_pointer (struct gdbarch *gdbarch, struct type *type, + gdb_byte *buf, CORE_ADDR addr) { - store_address (buf, TYPE_LENGTH (type), addr); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + + store_unsigned_integer (buf, TYPE_LENGTH (type), byte_order, addr); } void -address_to_signed_pointer (struct type *type, void *buf, CORE_ADDR addr) +address_to_signed_pointer (struct gdbarch *gdbarch, struct type *type, + gdb_byte *buf, CORE_ADDR addr) { - store_signed_integer (buf, TYPE_LENGTH (type), addr); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + + store_signed_integer (buf, TYPE_LENGTH (type), byte_order, addr); } /* Will calling read_var_value or locate_var_value on SYM end @@ -382,22 +372,24 @@ symbol_read_needs_frame (struct symbol *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); + case LOC_REGISTER: case LOC_ARG: case LOC_REF_ARG: - case LOC_REGPARM: case LOC_REGPARM_ADDR: case LOC_LOCAL: - case LOC_LOCAL_ARG: - case LOC_BASEREG: - case LOC_BASEREG_ARG: - case LOC_HP_THREAD_LOCAL_STATIC: return 1; case LOC_UNDEF: case LOC_CONST: case LOC_STATIC: - case LOC_INDIRECT: case LOC_TYPEDEF: case LOC_LABEL: @@ -416,170 +408,121 @@ symbol_read_needs_frame (struct symbol *sym) /* Given a struct symbol for a variable, and a stack frame id, read the value of the variable - and return a (pointer to a) struct value containing the value. - If the variable cannot be found, return a zero pointer. - If FRAME is NULL, use the deprecated_selected_frame. */ + and return a (pointer to a) struct value containing the value. + If the variable cannot be found, return a zero pointer. */ struct value * -read_var_value (register struct symbol *var, struct frame_info *frame) +read_var_value (struct symbol *var, struct frame_info *frame) { - register struct value *v; + struct value *v; struct type *type = SYMBOL_TYPE (var); CORE_ADDR addr; - register int len; + int len; - v = allocate_value (type); - VALUE_LVAL (v) = lval_memory; /* The most likely possibility. */ - VALUE_BFD_SECTION (v) = SYMBOL_BFD_SECTION (var); + /* 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 + instead of zero. However, we do not replace the typedef type by the + target type, because we want to keep the typedef in order to be able to + set the returned value type description correctly. */ + check_typedef (type); len = TYPE_LENGTH (type); - if (frame == NULL) - frame = deprecated_selected_frame; + if (symbol_read_needs_frame (var)) + gdb_assert (frame); switch (SYMBOL_CLASS (var)) { case LOC_CONST: /* Put the constant back in target format. */ - store_signed_integer (VALUE_CONTENTS_RAW (v), len, + v = allocate_value (type); + store_signed_integer (value_contents_raw (v), len, + gdbarch_byte_order (get_type_arch (type)), (LONGEST) SYMBOL_VALUE (var)); VALUE_LVAL (v) = not_lval; return v; case LOC_LABEL: /* Put the constant back in target format. */ + v = allocate_value (type); if (overlay_debugging) { CORE_ADDR addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (var), - SYMBOL_BFD_SECTION (var)); - store_typed_address (VALUE_CONTENTS_RAW (v), type, addr); + SYMBOL_OBJ_SECTION (var)); + + store_typed_address (value_contents_raw (v), type, addr); } else - store_typed_address (VALUE_CONTENTS_RAW (v), type, + store_typed_address (value_contents_raw (v), type, SYMBOL_VALUE_ADDRESS (var)); VALUE_LVAL (v) = not_lval; return v; case LOC_CONST_BYTES: - { - char *bytes_addr; - bytes_addr = SYMBOL_VALUE_BYTES (var); - memcpy (VALUE_CONTENTS_RAW (v), bytes_addr, len); - VALUE_LVAL (v) = not_lval; - return v; - } + v = allocate_value (type); + memcpy (value_contents_raw (v), SYMBOL_VALUE_BYTES (var), len); + 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_BFD_SECTION (var)); + SYMBOL_OBJ_SECTION (var)); else addr = SYMBOL_VALUE_ADDRESS (var); break; - case LOC_INDIRECT: - { - /* The import slot does not have a real address in it from the - dynamic loader (dld.sl on HP-UX), if the target hasn't - begun execution yet, so check for that. */ - CORE_ADDR locaddr; - struct value *loc; - if (!target_has_execution) - error ("\ -Attempt to access variable defined in different shared object or load module when\n\ -addresses have not been bound by the dynamic loader. Try again when executable is running."); - - locaddr = SYMBOL_VALUE_ADDRESS (var); - loc = value_at (lookup_pointer_type (type), locaddr, NULL); - addr = value_as_address (loc); - } - case LOC_ARG: - if (frame == NULL) - return 0; - addr = FRAME_ARGS_ADDRESS (frame); + addr = get_frame_args_address (frame); if (!addr) return 0; addr += SYMBOL_VALUE (var); + v = allocate_value_lazy (type); break; case LOC_REF_ARG: { struct value *ref; CORE_ADDR argref; - if (frame == NULL) - return 0; - argref = FRAME_ARGS_ADDRESS (frame); + + argref = get_frame_args_address (frame); if (!argref) return 0; argref += SYMBOL_VALUE (var); - ref = value_at (lookup_pointer_type (type), argref, NULL); + ref = value_at (lookup_pointer_type (type), argref); addr = value_as_address (ref); + v = allocate_value_lazy (type); break; } case LOC_LOCAL: - case LOC_LOCAL_ARG: - if (frame == NULL) - return 0; - addr = FRAME_LOCALS_ADDRESS (frame); + addr = get_frame_locals_address (frame); addr += SYMBOL_VALUE (var); + v = allocate_value_lazy (type); break; - case LOC_BASEREG: - case LOC_BASEREG_ARG: - case LOC_HP_THREAD_LOCAL_STATIC: - { - struct value *regval; - - regval = value_from_register (lookup_pointer_type (type), - SYMBOL_BASEREG (var), frame); - if (regval == NULL) - error ("Value of base register not available."); - addr = value_as_address (regval); - addr += SYMBOL_VALUE (var); - break; - } - - case LOC_THREAD_LOCAL_STATIC: - { - if (target_get_thread_local_address_p ()) - addr = target_get_thread_local_address (inferior_ptid, - SYMBOL_OBJFILE (var), - SYMBOL_VALUE_ADDRESS (var)); - /* It wouldn't be wrong here to try a gdbarch method, too; - finding TLS is an ABI-specific thing. But we don't do that - yet. */ - else - error ("Cannot find thread-local variables on this target"); - break; - } - case LOC_TYPEDEF: - error ("Cannot look up value of a typedef"); + error (_("Cannot look up value of a typedef")); break; case LOC_BLOCK: + v = allocate_value_lazy (type); if (overlay_debugging) - VALUE_ADDRESS (v) = symbol_overlayed_address - (BLOCK_START (SYMBOL_BLOCK_VALUE (var)), SYMBOL_BFD_SECTION (var)); + addr = symbol_overlayed_address + (BLOCK_START (SYMBOL_BLOCK_VALUE (var)), SYMBOL_OBJ_SECTION (var)); else - VALUE_ADDRESS (v) = BLOCK_START (SYMBOL_BLOCK_VALUE (var)); - return v; + addr = BLOCK_START (SYMBOL_BLOCK_VALUE (var)); + break; case LOC_REGISTER: - case LOC_REGPARM: case LOC_REGPARM_ADDR: { - struct block *b; - int regno = SYMBOL_VALUE (var); + int regno = SYMBOL_REGISTER_OPS (var) + ->register_number (var, get_frame_arch (frame)); struct value *regval; - if (frame == NULL) - return 0; - b = get_frame_block (frame, 0); - if (SYMBOL_CLASS (var) == LOC_REGPARM_ADDR) { regval = value_from_register (lookup_pointer_type (type), @@ -587,331 +530,163 @@ addresses have not been bound by the dynamic loader. Try again when executable i frame); if (regval == NULL) - error ("Value of register variable not available."); + error (_("Value of register variable not available.")); addr = value_as_address (regval); - VALUE_LVAL (v) = lval_memory; + v = allocate_value_lazy (type); } else { regval = value_from_register (type, regno, frame); if (regval == NULL) - error ("Value of register variable not available."); + error (_("Value of register variable not available.")); return regval; } } 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); + case LOC_UNRESOLVED: { struct minimal_symbol *msym; + struct obj_section *obj_section; - msym = lookup_minimal_symbol (SYMBOL_NAME (var), NULL, NULL); + msym = lookup_minimal_symbol (SYMBOL_LINKAGE_NAME (var), NULL, NULL); if (msym == NULL) return 0; if (overlay_debugging) addr = symbol_overlayed_address (SYMBOL_VALUE_ADDRESS (msym), - SYMBOL_BFD_SECTION (msym)); + SYMBOL_OBJ_SECTION (msym)); else addr = SYMBOL_VALUE_ADDRESS (msym); + + obj_section = SYMBOL_OBJ_SECTION (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; case LOC_OPTIMIZED_OUT: + v = allocate_value_lazy (type); VALUE_LVAL (v) = not_lval; - VALUE_OPTIMIZED_OUT (v) = 1; + set_value_optimized_out (v, 1); return v; default: - error ("Cannot look up value of a botched symbol."); + error (_("Cannot look up value of a botched symbol.")); break; } - VALUE_ADDRESS (v) = addr; - VALUE_LAZY (v) = 1; + VALUE_LVAL (v) = lval_memory; + set_value_address (v, addr); return v; } -/* Return a value of type TYPE, stored in register REGNUM, in frame - FRAME. - - NOTE: returns NULL if register value is not available. - Caller will check return value or die! */ +/* Install default attributes for register values. */ struct value * -value_from_register (struct type *type, int regnum, struct frame_info *frame) +default_value_from_register (struct type *type, int regnum, + struct frame_info *frame) { - char *raw_buffer = (char*) alloca (MAX_REGISTER_RAW_SIZE); - CORE_ADDR addr; - int optim; - struct value *v = allocate_value (type); - char *value_bytes = 0; - int value_bytes_copied = 0; - int num_storage_locs; - enum lval_type lval; - int len; - - CHECK_TYPEDEF (type); - len = TYPE_LENGTH (type); - - VALUE_REGNO (v) = regnum; - - num_storage_locs = (len > REGISTER_VIRTUAL_SIZE (regnum) ? - ((len - 1) / REGISTER_RAW_SIZE (regnum)) + 1 : - 1); - - if (num_storage_locs > 1 -#ifdef GDB_TARGET_IS_H8500 - || TYPE_CODE (type) == TYPE_CODE_PTR -#endif - ) - { - /* Value spread across multiple storage locations. */ - - int local_regnum; - int mem_stor = 0, reg_stor = 0; - int mem_tracking = 1; - CORE_ADDR last_addr = 0; - CORE_ADDR first_addr = 0; - - value_bytes = (char *) alloca (len + MAX_REGISTER_RAW_SIZE); - - /* Copy all of the data out, whereever it may be. */ - -#ifdef GDB_TARGET_IS_H8500 -/* This piece of hideosity is required because the H8500 treats registers - differently depending upon whether they are used as pointers or not. As a - pointer, a register needs to have a page register tacked onto the front. - An alternate way to do this would be to have gcc output different register - numbers for the pointer & non-pointer form of the register. But, it - doesn't, so we're stuck with this. */ - - if (TYPE_CODE (type) == TYPE_CODE_PTR - && len > 2) - { - int page_regnum; - - switch (regnum) - { - case R0_REGNUM: - case R1_REGNUM: - case R2_REGNUM: - case R3_REGNUM: - page_regnum = SEG_D_REGNUM; - break; - case R4_REGNUM: - case R5_REGNUM: - page_regnum = SEG_E_REGNUM; - break; - case R6_REGNUM: - case R7_REGNUM: - page_regnum = SEG_T_REGNUM; - break; - } - - value_bytes[0] = 0; - get_saved_register (value_bytes + 1, - &optim, - &addr, - frame, - page_regnum, - &lval); - - if (register_cached (page_regnum) == -1) - return NULL; /* register value not available */ - - if (lval == lval_register) - reg_stor++; - else - mem_stor++; - first_addr = addr; - last_addr = addr; - - get_saved_register (value_bytes + 2, - &optim, - &addr, - frame, - regnum, - &lval); - - if (register_cached (regnum) == -1) - return NULL; /* register value not available */ - - if (lval == lval_register) - reg_stor++; - else - { - mem_stor++; - mem_tracking = mem_tracking && (addr == last_addr); - } - last_addr = addr; - } - else -#endif /* GDB_TARGET_IS_H8500 */ - for (local_regnum = regnum; - value_bytes_copied < len; - (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum), - ++local_regnum)) - { - get_saved_register (value_bytes + value_bytes_copied, - &optim, - &addr, - frame, - local_regnum, - &lval); - - if (register_cached (local_regnum) == -1) - return NULL; /* register value not available */ - - if (regnum == local_regnum) - first_addr = addr; - if (lval == lval_register) - reg_stor++; - else - { - mem_stor++; - - mem_tracking = - (mem_tracking - && (regnum == local_regnum - || addr == last_addr)); - } - last_addr = addr; - } - - if ((reg_stor && mem_stor) - || (mem_stor && !mem_tracking)) - /* Mixed storage; all of the hassle we just went through was - for some good purpose. */ - { - VALUE_LVAL (v) = lval_reg_frame_relative; - VALUE_FRAME (v) = get_frame_base (frame); - VALUE_FRAME_REGNUM (v) = regnum; - } - else if (mem_stor) - { - VALUE_LVAL (v) = lval_memory; - VALUE_ADDRESS (v) = first_addr; - } - else if (reg_stor) - { - VALUE_LVAL (v) = lval_register; - VALUE_ADDRESS (v) = first_addr; - } - else - internal_error (__FILE__, __LINE__, - "value_from_register: Value not stored anywhere!"); - - VALUE_OPTIMIZED_OUT (v) = optim; - - /* Any structure stored in more than one register will always be - an integral number of registers. Otherwise, you'd need to do - some fiddling with the last register copied here for little - endian machines. */ - - /* Copy into the contents section of the value. */ - memcpy (VALUE_CONTENTS_RAW (v), value_bytes, len); - - /* Finally do any conversion necessary when extracting this - type from more than one register. */ -#ifdef REGISTER_CONVERT_TO_TYPE - REGISTER_CONVERT_TO_TYPE (regnum, type, VALUE_CONTENTS_RAW (v)); -#endif - return v; - } - - /* Data is completely contained within a single register. Locate the - register's contents in a real register or in core; - read the data in raw format. */ - - get_saved_register (raw_buffer, &optim, &addr, frame, regnum, &lval); + 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_REGNUM (value) = regnum; + + /* Any structure stored in more than one register will always be + an integral number of registers. Otherwise, you need to do + some fiddling with the last register copied here for little + endian machines. */ + if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG + && len < register_size (gdbarch, regnum)) + /* Big-endian, and we want less than full size. */ + set_value_offset (value, register_size (gdbarch, regnum) - len); + else + set_value_offset (value, 0); - if (register_cached (regnum) == -1) - return NULL; /* register value not available */ + return value; +} - VALUE_OPTIMIZED_OUT (v) = optim; - VALUE_LVAL (v) = lval; - VALUE_ADDRESS (v) = addr; +/* Return a value of type TYPE, stored in register REGNUM, in frame FRAME. */ - /* Convert the raw register to the corresponding data value's memory - format, if necessary. */ +struct value * +value_from_register (struct type *type, int regnum, struct frame_info *frame) +{ + struct gdbarch *gdbarch = get_frame_arch (frame); + struct type *type1 = check_typedef (type); + struct value *v; + int optim, unavail, ok; - if (CONVERT_REGISTER_P (regnum)) + if (gdbarch_convert_register_p (gdbarch, regnum, type1)) { - REGISTER_TO_VALUE (regnum, type, raw_buffer, VALUE_CONTENTS_RAW (v)); + /* The ISA/ABI need to something weird when obtaining the + specified value from this register. It might need to + re-order non-adjacent, starting with REGNUM (see MIPS and + i386). It might need to convert the [float] register into + the corresponding [integer] type (see Alpha). The assumption + is that gdbarch_register_to_value populates the entire value + including the location. */ + v = allocate_value (type); + VALUE_LVAL (v) = lval_register; + VALUE_FRAME_ID (v) = get_frame_id (frame); + VALUE_REGNUM (v) = regnum; + ok = gdbarch_register_to_value (gdbarch, frame, regnum, type1, + value_contents_raw (v), &optim, + &unavail); } else { - /* Raw and virtual formats are the same for this register. */ + int len = TYPE_LENGTH (type); - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG && len < REGISTER_RAW_SIZE (regnum)) - { - /* Big-endian, and we want less than full size. */ - VALUE_OFFSET (v) = REGISTER_RAW_SIZE (regnum) - len; - } + /* Construct the value. */ + v = gdbarch_value_from_register (gdbarch, type, regnum, frame); + + /* Get the data. */ + ok = get_frame_register_bytes (frame, regnum, value_offset (v), len, + value_contents_raw (v), + &optim, &unavail); + } - memcpy (VALUE_CONTENTS_RAW (v), raw_buffer + VALUE_OFFSET (v), len); + if (!ok) + { + if (optim) + set_value_optimized_out (v, 1); + if (unavail) + mark_value_bytes_unavailable (v, 0, TYPE_LENGTH (type)); } return v; } - -/* Given a struct symbol for a variable or function, - and a stack frame id, - return a (pointer to a) struct value containing the properly typed - address. */ - -struct value * -locate_var_value (register struct symbol *var, struct frame_info *frame) -{ - CORE_ADDR addr = 0; - struct type *type = SYMBOL_TYPE (var); - struct value *lazy_value; - /* Evaluate it first; if the result is a memory address, we're fine. - Lazy evaluation pays off here. */ +/* Return contents of register REGNUM in frame FRAME as address, + interpreted as value of type TYPE. Will abort if register + value is not available. */ - lazy_value = read_var_value (var, frame); - if (lazy_value == 0) - error ("Address of \"%s\" is unknown.", SYMBOL_SOURCE_NAME (var)); - - if (VALUE_LAZY (lazy_value) - || TYPE_CODE (type) == TYPE_CODE_FUNC) - { - struct value *val; - - addr = VALUE_ADDRESS (lazy_value); - val = value_from_pointer (lookup_pointer_type (type), addr); - VALUE_BFD_SECTION (val) = VALUE_BFD_SECTION (lazy_value); - return val; - } +CORE_ADDR +address_from_register (struct type *type, int regnum, struct frame_info *frame) +{ + struct value *value; + CORE_ADDR result; - /* Not a memory address; check what the problem was. */ - switch (VALUE_LVAL (lazy_value)) - { - case lval_register: - gdb_assert (REGISTER_NAME (VALUE_REGNO (lazy_value)) != NULL - && *REGISTER_NAME (VALUE_REGNO (lazy_value)) != '\0'); - error("Address requested for identifier " - "\"%s\" which is in register $%s", - SYMBOL_SOURCE_NAME (var), - REGISTER_NAME (VALUE_REGNO (lazy_value))); - break; + value = value_from_register (type, regnum, frame); + gdb_assert (value); - case lval_reg_frame_relative: - gdb_assert (REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value)) != NULL - && *REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value)) != '\0'); - error("Address requested for identifier " - "\"%s\" which is in frame register $%s", - SYMBOL_SOURCE_NAME (var), - REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value))); - break; + result = value_as_address (value); + release_value (value); + value_free (value); - default: - error ("Can't take address of \"%s\" which isn't an lvalue.", - SYMBOL_SOURCE_NAME (var)); - break; - } - return 0; /* For lint -- never reached */ + return result; }