diff options
Diffstat (limited to 'contrib/gdb/gdb/values.c')
| -rw-r--r-- | contrib/gdb/gdb/values.c | 1087 |
1 files changed, 444 insertions, 643 deletions
diff --git a/contrib/gdb/gdb/values.c b/contrib/gdb/gdb/values.c index c7053b8..9445d9c 100644 --- a/contrib/gdb/gdb/values.c +++ b/contrib/gdb/gdb/values.c @@ -1,22 +1,24 @@ /* Low level packing and unpacking of values for GDB, the GNU Debugger. - Copyright 1986, 87, 89, 91, 93, 94, 95, 96, 97, 1998 + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2002. Free Software Foundation, Inc. -This file is part of GDB. + 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 -(at your option) any later version. + 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 + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + 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. */ #include "defs.h" #include "gdb_string.h" @@ -24,28 +26,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdbtypes.h" #include "value.h" #include "gdbcore.h" -#include "frame.h" #include "command.h" #include "gdbcmd.h" #include "target.h" #include "language.h" #include "scm-lang.h" #include "demangle.h" +#include "doublest.h" +#include "gdb_assert.h" /* Prototypes for exported functions. */ -void _initialize_values PARAMS ((void)); +void _initialize_values (void); /* Prototypes for local functions. */ -static value_ptr value_headof PARAMS ((value_ptr, struct type *, - struct type *)); +static struct value *value_headof (struct value *, struct type *, struct type *); -static void show_values PARAMS ((char *, int)); +static void show_values (char *, int); -static void show_convenience PARAMS ((char *, int)); +static void show_convenience (char *, int); -static int vb_match PARAMS ((struct type *, int, struct type *)); /* The value-history records all the values printed by print commands during this session. Each chunk @@ -56,10 +57,10 @@ static int vb_match PARAMS ((struct type *, int, struct type *)); #define VALUE_HISTORY_CHUNK 60 struct value_history_chunk -{ - struct value_history_chunk *next; - value_ptr values[VALUE_HISTORY_CHUNK]; -}; + { + struct value_history_chunk *next; + struct value *values[VALUE_HISTORY_CHUNK]; + }; /* Chain of chunks now in use. */ @@ -71,15 +72,14 @@ static int value_history_count; /* Abs number of last entry stored */ (except for those released by calls to release_value) This is so they can be freed after each command. */ -static value_ptr all_values; +static struct value *all_values; /* Allocate a value that has the correct length for type TYPE. */ -value_ptr -allocate_value (type) - struct type *type; +struct value * +allocate_value (struct type *type) { - register value_ptr val; + struct value *val; struct type *atype = check_typedef (type); val = (struct value *) xmalloc (sizeof (struct value) + TYPE_LENGTH (atype)); @@ -106,17 +106,15 @@ allocate_value (type) /* Allocate a value that has the correct length for COUNT repetitions type TYPE. */ -value_ptr -allocate_repeat_value (type, count) - struct type *type; - int count; +struct value * +allocate_repeat_value (struct type *type, int count) { - int low_bound = current_language->string_lower_bound; /* ??? */ + int low_bound = current_language->string_lower_bound; /* ??? */ /* FIXME-type-allocation: need a way to free this type when we are done with it. */ struct type *range_type - = create_range_type ((struct type *) NULL, builtin_type_int, - low_bound, count + low_bound - 1); + = create_range_type ((struct type *) NULL, builtin_type_int, + low_bound, count + low_bound - 1); /* FIXME-type-allocation: need a way to free this type when we are done with it. */ return allocate_value (create_array_type ((struct type *) NULL, @@ -126,8 +124,8 @@ allocate_repeat_value (type, count) /* Return a mark in the value chain. All values allocated after the mark is obtained (except for those released) are subject to being freed if a subsequent value_free_to_mark is passed the mark. */ -value_ptr -value_mark () +struct value * +value_mark (void) { return all_values; } @@ -135,10 +133,10 @@ value_mark () /* Free all values allocated since MARK was obtained by value_mark (except for those released). */ void -value_free_to_mark (mark) - value_ptr mark; +value_free_to_mark (struct value *mark) { - value_ptr val, next; + struct value *val; + struct value *next; for (val = all_values; val && val != mark; val = next) { @@ -152,9 +150,10 @@ value_free_to_mark (mark) Called after each command, successful or not. */ void -free_all_values () +free_all_values (void) { - register value_ptr val, next; + struct value *val; + struct value *next; for (val = all_values; val; val = next) { @@ -169,10 +168,9 @@ free_all_values () so it will not be freed automatically. */ void -release_value (val) - register value_ptr val; +release_value (struct value *val) { - register value_ptr v; + struct value *v; if (all_values == val) { @@ -191,11 +189,11 @@ release_value (val) } /* Release all values up to mark */ -value_ptr -value_release_to_mark (mark) - value_ptr mark; +struct value * +value_release_to_mark (struct value *mark) { - value_ptr val, next; + struct value *val; + struct value *next; for (val = next = all_values; next; next = VALUE_NEXT (next)) if (VALUE_NEXT (next) == mark) @@ -212,12 +210,11 @@ value_release_to_mark (mark) It contains the same contents, for same memory address, but it's a different block of storage. */ -value_ptr -value_copy (arg) - value_ptr arg; +struct value * +value_copy (struct value *arg) { register struct type *encl_type = VALUE_ENCLOSING_TYPE (arg); - register value_ptr val = allocate_value (encl_type); + struct value *val = allocate_value (encl_type); VALUE_TYPE (val) = VALUE_TYPE (arg); VALUE_LVAL (val) = VALUE_LVAL (arg); VALUE_ADDRESS (val) = VALUE_ADDRESS (arg); @@ -249,8 +246,7 @@ value_copy (arg) value history index of this new item. */ int -record_latest_value (val) - value_ptr val; +record_latest_value (struct value *val) { int i; @@ -272,9 +268,9 @@ record_latest_value (val) i = value_history_count % VALUE_HISTORY_CHUNK; if (i == 0) { - register struct value_history_chunk *new - = (struct value_history_chunk *) - xmalloc (sizeof (struct value_history_chunk)); + struct value_history_chunk *new + = (struct value_history_chunk *) + xmalloc (sizeof (struct value_history_chunk)); memset (new->values, 0, sizeof new->values); new->next = value_history_chain; value_history_chain = new; @@ -290,11 +286,10 @@ record_latest_value (val) /* Return a copy of the value in the history with sequence number NUM. */ -value_ptr -access_value_history (num) - int num; +struct value * +access_value_history (int num) { - register struct value_history_chunk *chunk; + struct value_history_chunk *chunk; register int i; register int absnum = num; @@ -330,39 +325,37 @@ access_value_history (num) because the type pointers become invalid. */ void -clear_value_history () +clear_value_history (void) { - register struct value_history_chunk *next; + struct value_history_chunk *next; register int i; - register value_ptr val; + struct value *val; while (value_history_chain) { for (i = 0; i < VALUE_HISTORY_CHUNK; i++) if ((val = value_history_chain->values[i]) != NULL) - free ((PTR)val); + xfree (val); next = value_history_chain->next; - free ((PTR)value_history_chain); + xfree (value_history_chain); value_history_chain = next; } value_history_count = 0; } static void -show_values (num_exp, from_tty) - char *num_exp; - int from_tty; +show_values (char *num_exp, int from_tty) { register int i; - register value_ptr val; + struct value *val; static int num = 1; if (num_exp) { - /* "info history +" should print from the stored position. - "info history <exp>" should print around value number <exp>. */ + /* "info history +" should print from the stored position. + "info history <exp>" should print around value number <exp>. */ if (num_exp[0] != '+' || num_exp[1] != '\0') - num = parse_and_eval_address (num_exp) - 5; + num = parse_and_eval_long (num_exp) - 5; } else { @@ -408,8 +401,7 @@ static struct internalvar *internalvars; one is created, with a void value. */ struct internalvar * -lookup_internalvar (name) - char *name; +lookup_internalvar (char *name) { register struct internalvar *var; @@ -426,16 +418,15 @@ lookup_internalvar (name) return var; } -value_ptr -value_of_internalvar (var) - struct internalvar *var; +struct value * +value_of_internalvar (struct internalvar *var) { - register value_ptr val; + struct value *val; #ifdef IS_TRAPPED_INTERNALVAR if (IS_TRAPPED_INTERNALVAR (var->name)) return VALUE_OF_TRAPPED_INTERNALVAR (var); -#endif +#endif val = value_copy (var->value); if (VALUE_LAZY (val)) @@ -446,10 +437,8 @@ value_of_internalvar (var) } void -set_internalvar_component (var, offset, bitpos, bitsize, newval) - struct internalvar *var; - int offset, bitpos, bitsize; - value_ptr newval; +set_internalvar_component (struct internalvar *var, int offset, int bitpos, + int bitsize, struct value *newval) { register char *addr = VALUE_CONTENTS (var->value) + offset; @@ -466,11 +455,9 @@ set_internalvar_component (var, offset, bitpos, bitsize, newval) } void -set_internalvar (var, val) - struct internalvar *var; - value_ptr val; +set_internalvar (struct internalvar *var, struct value *val) { - value_ptr newval; + struct value *newval; #ifdef IS_TRAPPED_INTERNALVAR if (IS_TRAPPED_INTERNALVAR (var->name)) @@ -492,15 +479,14 @@ set_internalvar (var, val) something in the value chain (i.e., before release_value is called), because after the error free_all_values will get called before long. */ - free ((PTR)var->value); + xfree (var->value); var->value = newval; release_value (newval); /* End code which must not call error(). */ } char * -internalvar_name (var) - struct internalvar *var; +internalvar_name (struct internalvar *var) { return var->name; } @@ -509,7 +495,7 @@ internalvar_name (var) because that makes the values invalid. */ void -clear_internalvars () +clear_internalvars (void) { register struct internalvar *var; @@ -517,16 +503,14 @@ clear_internalvars () { var = internalvars; internalvars = var->next; - free ((PTR)var->name); - free ((PTR)var->value); - free ((PTR)var); + xfree (var->name); + xfree (var->value); + xfree (var); } } static void -show_convenience (ignore, from_tty) - char *ignore; - int from_tty; +show_convenience (char *ignore, int from_tty) { register struct internalvar *var; int varseen = 0; @@ -557,8 +541,7 @@ use \"set\" as in \"set $foo = 5\" to define them.\n"); Does not deallocate the value. */ LONGEST -value_as_long (val) - register value_ptr val; +value_as_long (struct value *val) { /* This coerces arrays and functions, which is necessary (e.g. in disassemble_command). It also dereferences references, which @@ -568,22 +551,21 @@ value_as_long (val) } DOUBLEST -value_as_double (val) - register value_ptr val; +value_as_double (struct value *val) { DOUBLEST foo; int inv; - + foo = unpack_double (VALUE_TYPE (val), VALUE_CONTENTS (val), &inv); if (inv) error ("Invalid floating value found in program."); return foo; } -/* Extract a value as a C pointer. - Does not deallocate the value. */ +/* Extract a value as a C pointer. Does not deallocate the value. + Note that val's type may not actually be a pointer; value_as_long + handles all the cases. */ CORE_ADDR -value_as_pointer (val) - value_ptr val; +value_as_address (struct value *val) { /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure whether we want this to be true eventually. */ @@ -591,9 +573,95 @@ value_as_pointer (val) /* ADDR_BITS_REMOVE is wrong if we are being called for a non-address (e.g. argument to "signal", "info break", etc.), or for pointers to char, in which the low bits *are* significant. */ - return ADDR_BITS_REMOVE(value_as_long (val)); + return ADDR_BITS_REMOVE (value_as_long (val)); #else - return value_as_long (val); + + /* There are several targets (IA-64, PowerPC, and others) which + don't represent pointers to functions as simply the address of + the function's entry point. For example, on the IA-64, a + function pointer points to a two-word descriptor, generated by + the linker, which contains the function's entry point, and the + value the IA-64 "global pointer" register should have --- to + support position-independent code. The linker generates + descriptors only for those functions whose addresses are taken. + + On such targets, it's difficult for GDB to convert an arbitrary + function address into a function pointer; it has to either find + an existing descriptor for that function, or call malloc and + build its own. On some targets, it is impossible for GDB to + build a descriptor at all: the descriptor must contain a jump + instruction; data memory cannot be executed; and code memory + cannot be modified. + + Upon entry to this function, if VAL is a value of type `function' + (that is, TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_FUNC), then + VALUE_ADDRESS (val) is the address of the function. This is what + you'll get if you evaluate an expression like `main'. The call + to COERCE_ARRAY below actually does all the usual unary + conversions, which includes converting values of type `function' + to `pointer to function'. This is the challenging conversion + discussed above. Then, `unpack_long' will convert that pointer + back into an address. + + So, suppose the user types `disassemble foo' on an architecture + with a strange function pointer representation, on which GDB + cannot build its own descriptors, and suppose further that `foo' + has no linker-built descriptor. The address->pointer conversion + will signal an error and prevent the command from running, even + though the next step would have been to convert the pointer + directly back into the same address. + + The following shortcut avoids this whole mess. If VAL is a + function, just return its address directly. */ + if (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_FUNC + || TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_METHOD) + return VALUE_ADDRESS (val); + + COERCE_ARRAY (val); + + /* Some architectures (e.g. Harvard), map instruction and data + addresses onto a single large unified address space. For + instance: An architecture may consider a large integer in the + range 0x10000000 .. 0x1000ffff to already represent a data + addresses (hence not need a pointer to address conversion) while + a small integer would still need to be converted integer to + pointer to address. Just assume such architectures handle all + integer conversions in a single function. */ + + /* JimB writes: + + I think INTEGER_TO_ADDRESS is a good idea as proposed --- but we + must admonish GDB hackers to make sure its behavior matches the + compiler's, whenever possible. + + In general, I think GDB should evaluate expressions the same way + the compiler does. When the user copies an expression out of + their source code and hands it to a `print' command, they should + get the same value the compiler would have computed. Any + deviation from this rule can cause major confusion and annoyance, + and needs to be justified carefully. In other words, GDB doesn't + really have the freedom to do these conversions in clever and + useful ways. + + AndrewC pointed out that users aren't complaining about how GDB + casts integers to pointers; they are complaining that they can't + take an address from a disassembly listing and give it to `x/i'. + This is certainly important. + + Adding an architecture method like INTEGER_TO_ADDRESS certainly + makes it possible for GDB to "get it right" in all circumstances + --- the target has complete control over how things get done, so + people can Do The Right Thing for their target without breaking + anyone else. The standard doesn't specify how integers get + converted to pointers; usually, the ABI doesn't either, but + ABI-specific code is a more reasonable place to handle it. */ + + if (TYPE_CODE (VALUE_TYPE (val)) != TYPE_CODE_PTR + && TYPE_CODE (VALUE_TYPE (val)) != TYPE_CODE_REF + && INTEGER_TO_ADDRESS_P ()) + return INTEGER_TO_ADDRESS (VALUE_TYPE (val), VALUE_CONTENTS (val)); + + return unpack_long (VALUE_TYPE (val), VALUE_CONTENTS (val)); #endif } @@ -612,9 +680,7 @@ value_as_pointer (val) to an INT (or some size). After all, it is only an offset. */ LONGEST -unpack_long (type, valaddr) - struct type *type; - char *valaddr; +unpack_long (struct type *type, char *valaddr) { register enum type_code code = TYPE_CODE (type); register int len = TYPE_LENGTH (type); @@ -639,17 +705,13 @@ unpack_long (type, valaddr) return extract_signed_integer (valaddr, len); case TYPE_CODE_FLT: - return extract_floating (valaddr, len); + return extract_typed_floating (valaddr, type); case TYPE_CODE_PTR: case TYPE_CODE_REF: /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure - whether we want this to be true eventually. */ -#ifdef GDB_TARGET_IS_D10V - if (len == 2) - return D10V_MAKE_DADDR(extract_address (valaddr, len)); -#endif - return extract_address (valaddr, len); + whether we want this to be true eventually. */ + return extract_typed_address (valaddr, type); case TYPE_CODE_MEMBER: error ("not implemented: member types in unpack_long"); @@ -657,7 +719,7 @@ unpack_long (type, valaddr) default: error ("Value can't be converted to integer."); } - return 0; /* Placate lint. */ + return 0; /* Placate lint. */ } /* Return a double value from the specified type and address. @@ -667,10 +729,7 @@ unpack_long (type, valaddr) format, result is in host format. */ DOUBLEST -unpack_double (type, valaddr, invp) - struct type *type; - char *valaddr; - int *invp; +unpack_double (struct type *type, char *valaddr, int *invp) { enum type_code code; int len; @@ -683,24 +742,28 @@ unpack_double (type, valaddr, invp) nosign = TYPE_UNSIGNED (type); if (code == TYPE_CODE_FLT) { -#ifdef INVALID_FLOAT - if (INVALID_FLOAT (valaddr, len)) - { - *invp = 1; - return 1.234567891011121314; - } -#endif - return extract_floating (valaddr, len); + /* NOTE: cagney/2002-02-19: There was a test here to see if the + floating-point value was valid (using the macro + INVALID_FLOAT). That test/macro have been removed. + + It turns out that only the VAX defined this macro and then + only in a non-portable way. Fixing the portability problem + wouldn't help since the VAX floating-point code is also badly + bit-rotten. The target needs to add definitions for the + methods TARGET_FLOAT_FORMAT and TARGET_DOUBLE_FORMAT - these + exactly describe the target floating-point format. The + problem here is that the corresponding floatformat_vax_f and + floatformat_vax_d values these methods should be set to are + also not defined either. Oops! + + Hopefully someone will add both the missing floatformat + definitions and floatformat_is_invalid() function. */ + return extract_typed_floating (valaddr, type); } else if (nosign) { /* Unsigned -- be sure we compensate for signed LONGEST. */ -#if !defined (_MSC_VER) || (_MSC_VER > 900) return (ULONGEST) unpack_long (type, valaddr); -#else - /* FIXME!!! msvc22 doesn't support unsigned __int64 -> double */ - return (LONGEST) unpack_long (type, valaddr); -#endif /* _MSC_VER */ } else { @@ -715,7 +778,7 @@ unpack_double (type, valaddr, invp) host byte order. If you want functions and arrays to be coerced to pointers, and - references to be dereferenced, call value_as_pointer() instead. + references to be dereferenced, call value_as_address() instead. C++: It is assumed that the front-end has taken care of all matters concerning pointers to members. A pointer @@ -723,21 +786,18 @@ unpack_double (type, valaddr, invp) to an INT (or some size). After all, it is only an offset. */ CORE_ADDR -unpack_pointer (type, valaddr) - struct type *type; - char *valaddr; +unpack_pointer (struct type *type, char *valaddr) { /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure whether we want this to be true eventually. */ return unpack_long (type, valaddr); } + /* Get the value of the FIELDN'th field (which must be static) of TYPE. */ -value_ptr -value_static_field (type, fieldno) - struct type *type; - int fieldno; +struct value * +value_static_field (struct type *type, int fieldno) { CORE_ADDR addr; asection *sect; @@ -753,39 +813,87 @@ value_static_field (type, fieldno) if (sym == NULL) { /* With some compilers, e.g. HP aCC, static data members are reported - as non-debuggable symbols */ - struct minimal_symbol * msym = lookup_minimal_symbol (phys_name, NULL, NULL); + as non-debuggable symbols */ + struct minimal_symbol *msym = lookup_minimal_symbol (phys_name, NULL, NULL); if (!msym) return NULL; else - { + { addr = SYMBOL_VALUE_ADDRESS (msym); sect = SYMBOL_BFD_SECTION (msym); } } else { - addr = SYMBOL_VALUE_ADDRESS (sym); - sect = SYMBOL_BFD_SECTION (sym); - } + /* Anything static that isn't a constant, has an address */ + if (SYMBOL_CLASS (sym) != LOC_CONST) + { + addr = SYMBOL_VALUE_ADDRESS (sym); + sect = SYMBOL_BFD_SECTION (sym); + } + /* However, static const's do not, the value is already known. */ + else + { + return value_from_longest (TYPE_FIELD_TYPE (type, fieldno), SYMBOL_VALUE (sym)); + } + } SET_FIELD_PHYSADDR (TYPE_FIELD (type, fieldno), addr); } return value_at (TYPE_FIELD_TYPE (type, fieldno), addr, sect); } +/* Change the enclosing type of a value object VAL to NEW_ENCL_TYPE. + You have to be careful here, since the size of the data area for the value + is set by the length of the enclosing type. So if NEW_ENCL_TYPE is bigger + than the old enclosing type, you have to allocate more space for the data. + The return value is a pointer to the new version of this value structure. */ + +struct value * +value_change_enclosing_type (struct value *val, struct type *new_encl_type) +{ + if (TYPE_LENGTH (new_encl_type) <= TYPE_LENGTH (VALUE_ENCLOSING_TYPE (val))) + { + VALUE_ENCLOSING_TYPE (val) = new_encl_type; + return val; + } + else + { + struct value *new_val; + struct value *prev; + + new_val = (struct value *) xrealloc (val, sizeof (struct value) + TYPE_LENGTH (new_encl_type)); + + /* We have to make sure this ends up in the same place in the value + chain as the original copy, so it's clean-up behavior is the same. + If the value has been released, this is a waste of time, but there + is no way to tell that in advance, so... */ + + if (val != all_values) + { + for (prev = all_values; prev != NULL; prev = prev->next) + { + if (prev->next == val) + { + prev->next = new_val; + break; + } + } + } + + return new_val; + } +} + /* Given a value ARG1 (offset by OFFSET bytes) of a struct or union type ARG_TYPE, extract and return the value of one of its (non-static) fields. FIELDNO says which field. */ -value_ptr -value_primitive_field (arg1, offset, fieldno, arg_type) - register value_ptr arg1; - int offset; - register int fieldno; - register struct type *arg_type; +struct value * +value_primitive_field (struct value *arg1, int offset, + register int fieldno, register struct type *arg_type) { - register value_ptr v; + struct value *v; register struct type *type; CHECK_TYPEDEF (arg_type); @@ -798,10 +906,12 @@ value_primitive_field (arg1, offset, fieldno, arg_type) v = value_from_longest (type, unpack_field_as_long (arg_type, VALUE_CONTENTS (arg1) - + offset, + + offset, fieldno)); VALUE_BITPOS (v) = TYPE_FIELD_BITPOS (arg_type, fieldno) % 8; VALUE_BITSIZE (v) = TYPE_FIELD_BITSIZE (arg_type, fieldno); + VALUE_OFFSET (v) = VALUE_OFFSET (arg1) + offset + + TYPE_FIELD_BITPOS (arg_type, fieldno) / 8; } else if (fieldno < TYPE_N_BASECLASSES (arg_type)) { @@ -809,7 +919,7 @@ value_primitive_field (arg1, offset, fieldno, arg_type) entire object's contents for later references to virtual bases, etc. */ v = allocate_value (VALUE_ENCLOSING_TYPE (arg1)); - VALUE_TYPE (v) = arg_type; + VALUE_TYPE (v) = type; if (VALUE_LAZY (arg1)) VALUE_LAZY (v) = 1; else @@ -817,9 +927,9 @@ value_primitive_field (arg1, offset, fieldno, arg_type) TYPE_LENGTH (VALUE_ENCLOSING_TYPE (arg1))); VALUE_OFFSET (v) = VALUE_OFFSET (arg1); VALUE_EMBEDDED_OFFSET (v) - = offset + - VALUE_EMBEDDED_OFFSET (arg1) + - TYPE_FIELD_BITPOS (arg_type, fieldno) / 8; + = offset + + VALUE_EMBEDDED_OFFSET (arg1) + + TYPE_FIELD_BITPOS (arg_type, fieldno) / 8; } else { @@ -832,14 +942,16 @@ value_primitive_field (arg1, offset, fieldno, arg_type) memcpy (VALUE_CONTENTS_RAW (v), VALUE_CONTENTS_RAW (arg1) + offset, TYPE_LENGTH (type)); - VALUE_OFFSET (v) = VALUE_OFFSET (arg1) + offset; + VALUE_OFFSET (v) = VALUE_OFFSET (arg1) + offset + + VALUE_EMBEDDED_OFFSET (arg1); } VALUE_LVAL (v) = VALUE_LVAL (arg1); if (VALUE_LVAL (arg1) == lval_internalvar) VALUE_LVAL (v) = lval_internalvar_component; VALUE_ADDRESS (v) = VALUE_ADDRESS (arg1); + VALUE_REGNO (v) = VALUE_REGNO (arg1); /* VALUE_OFFSET (v) = VALUE_OFFSET (arg1) + offset - + TYPE_FIELD_BITPOS (arg_type, fieldno) / 8; */ + + TYPE_FIELD_BITPOS (arg_type, fieldno) / 8; */ return v; } @@ -847,251 +959,65 @@ value_primitive_field (arg1, offset, fieldno, arg_type) extract and return the value of one of its (non-static) fields. FIELDNO says which field. */ -value_ptr -value_field (arg1, fieldno) - register value_ptr arg1; - register int fieldno; +struct value * +value_field (struct value *arg1, register int fieldno) { return value_primitive_field (arg1, 0, fieldno, VALUE_TYPE (arg1)); } /* Return a non-virtual function as a value. F is the list of member functions which contains the desired method. - J is an index into F which provides the desired method. */ - -value_ptr -value_fn_field (arg1p, f, j, type, offset) - value_ptr *arg1p; - struct fn_field *f; - int j; - struct type *type; - int offset; + J is an index into F which provides the desired method. + + We only use the symbol for its address, so be happy with either a + full symbol or a minimal symbol. + */ + +struct value * +value_fn_field (struct value **arg1p, struct fn_field *f, int j, struct type *type, + int offset) { - register value_ptr v; + struct value *v; register struct type *ftype = TYPE_FN_FIELD_TYPE (f, j); + char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); struct symbol *sym; + struct minimal_symbol *msym; - sym = lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, j), - 0, VAR_NAMESPACE, 0, NULL); - if (! sym) + sym = lookup_symbol (physname, 0, VAR_NAMESPACE, 0, NULL); + if (sym != NULL) + { + msym = NULL; + } + else + { + gdb_assert (sym == NULL); + msym = lookup_minimal_symbol (physname, NULL, NULL); + if (msym == NULL) return NULL; -/* - error ("Internal error: could not find physical method named %s", - TYPE_FN_FIELD_PHYSNAME (f, j)); -*/ - - v = allocate_value (ftype); - VALUE_ADDRESS (v) = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)); - VALUE_TYPE (v) = ftype; - - if (arg1p) - { - if (type != VALUE_TYPE (*arg1p)) - *arg1p = value_ind (value_cast (lookup_pointer_type (type), - value_addr (*arg1p))); - - /* Move the `this' pointer according to the offset. - VALUE_OFFSET (*arg1p) += offset; - */ } - return v; -} - -/* Return a virtual function as a value. - ARG1 is the object which provides the virtual function - table pointer. *ARG1P is side-effected in calling this function. - F is the list of member functions which contains the desired virtual - function. - J is an index into F which provides the desired virtual function. - - TYPE is the type in which F is located. */ -value_ptr -value_virtual_fn_field (arg1p, f, j, type, offset) - value_ptr *arg1p; - struct fn_field *f; - int j; - struct type *type; - int offset; -{ - value_ptr arg1 = *arg1p; - struct type *type1 = check_typedef (VALUE_TYPE (arg1)); - - if (TYPE_HAS_VTABLE (type)) + v = allocate_value (ftype); + if (sym) { - /* Deal with HP/Taligent runtime model for virtual functions */ - value_ptr vp; - value_ptr argp; /* arg1 cast to base */ - CORE_ADDR vfunc_addr; /* address of virtual method */ - CORE_ADDR coreptr; /* pointer to target address */ - int class_index; /* which class segment pointer to use */ - struct type * ftype = TYPE_FN_FIELD_TYPE (f, j); /* method type */ - - argp = value_cast (type, *arg1p); - - if (VALUE_ADDRESS (argp) == 0) - error ("Address of object is null; object may not have been created."); - - /* pai: FIXME -- 32x64 possible problem? */ - /* First word (4 bytes) in object layout is the vtable pointer */ - coreptr = * (CORE_ADDR *) (VALUE_CONTENTS (argp)); /* pai: (temp) */ - /* + offset + VALUE_EMBEDDED_OFFSET (argp)); */ - - if (!coreptr) - error ("Virtual table pointer is null for object; object may not have been created."); - - /* pai/1997-05-09 - * FIXME: The code here currently handles only - * the non-RRBC case of the Taligent/HP runtime spec; when RRBC - * is introduced, the condition for the "if" below will have to - * be changed to be a test for the RRBC case. */ - - if (1) - { - /* Non-RRBC case; the virtual function pointers are stored at fixed - * offsets in the virtual table. */ - - /* Retrieve the offset in the virtual table from the debug - * info. The offset of the vfunc's entry is in words from - * the beginning of the vtable; but first we have to adjust - * by HP_ACC_VFUNC_START to account for other entries */ - - /* pai: FIXME: 32x64 problem here, a word may be 8 bytes in - * which case the multiplier should be 8 and values should be long */ - vp = value_at (builtin_type_int, - coreptr + 4 * (TYPE_FN_FIELD_VOFFSET (f, j) + HP_ACC_VFUNC_START), NULL); - - coreptr = * (CORE_ADDR *) (VALUE_CONTENTS (vp)); - /* coreptr now contains the address of the virtual function */ - /* (Actually, it contains the pointer to the plabel for the function. */ - } - else - { - /* RRBC case; the virtual function pointers are found by double - * indirection through the class segment tables. */ - - /* Choose class segment depending on type we were passed */ - class_index = class_index_in_primary_list (type); - - /* Find class segment pointer. These are in the vtable slots after - * some other entries, so adjust by HP_ACC_VFUNC_START for that. */ - /* pai: FIXME 32x64 problem here, if words are 8 bytes long - * the multiplier below has to be 8 and value should be long. */ - vp = value_at (builtin_type_int, - coreptr + 4 * (HP_ACC_VFUNC_START + class_index), NULL); - /* Indirect once more, offset by function index */ - /* pai: FIXME 32x64 problem here, again multiplier could be 8 and value long */ - coreptr = * (CORE_ADDR *) (VALUE_CONTENTS (vp) + 4 * TYPE_FN_FIELD_VOFFSET (f, j)); - vp = value_at (builtin_type_int, coreptr, NULL); - coreptr = * (CORE_ADDR *) (VALUE_CONTENTS (vp)); - - /* coreptr now contains the address of the virtual function */ - /* (Actually, it contains the pointer to the plabel for the function.) */ - - } - - if (!coreptr) - error ("Address of virtual function is null; error in virtual table?"); - - /* Wrap this addr in a value and return pointer */ - vp = allocate_value (ftype); - VALUE_TYPE (vp) = ftype; - VALUE_ADDRESS (vp) = coreptr; - - /* pai: (temp) do we need the value_ind stuff in value_fn_field? */ - return vp; + VALUE_ADDRESS (v) = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)); + } + else + { + VALUE_ADDRESS (v) = SYMBOL_VALUE_ADDRESS (msym); } - else - { /* Not using HP/Taligent runtime conventions; so try to - * use g++ conventions for virtual table */ - - struct type *entry_type; - /* First, get the virtual function table pointer. That comes - with a strange type, so cast it to type `pointer to long' (which - should serve just fine as a function type). Then, index into - the table, and convert final value to appropriate function type. */ - value_ptr entry, vfn, vtbl; - value_ptr vi = value_from_longest (builtin_type_int, - (LONGEST) TYPE_FN_FIELD_VOFFSET (f, j)); - struct type *fcontext = TYPE_FN_FIELD_FCONTEXT (f, j); - struct type *context; - if (fcontext == NULL) - /* We don't have an fcontext (e.g. the program was compiled with - g++ version 1). Try to get the vtbl from the TYPE_VPTR_BASETYPE. - This won't work right for multiple inheritance, but at least we - should do as well as GDB 3.x did. */ - fcontext = TYPE_VPTR_BASETYPE (type); - context = lookup_pointer_type (fcontext); - /* Now context is a pointer to the basetype containing the vtbl. */ - if (TYPE_TARGET_TYPE (context) != type1) - { - value_ptr tmp = value_cast (context, value_addr (arg1)); - VALUE_POINTED_TO_OFFSET (tmp) = 0; - arg1 = value_ind (tmp); - type1 = check_typedef (VALUE_TYPE (arg1)); - } - - context = type1; - /* Now context is the basetype containing the vtbl. */ - - /* This type may have been defined before its virtual function table - was. If so, fill in the virtual function table entry for the - type now. */ - if (TYPE_VPTR_FIELDNO (context) < 0) - fill_in_vptr_fieldno (context); - - /* The virtual function table is now an array of structures - which have the form { int16 offset, delta; void *pfn; }. */ - vtbl = value_primitive_field (arg1, 0, TYPE_VPTR_FIELDNO (context), - TYPE_VPTR_BASETYPE (context)); - - /* With older versions of g++, the vtbl field pointed to an array - of structures. Nowadays it points directly to the structure. */ - if (TYPE_CODE (VALUE_TYPE (vtbl)) == TYPE_CODE_PTR - && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (vtbl))) == TYPE_CODE_ARRAY) - { - /* Handle the case where the vtbl field points to an - array of structures. */ - vtbl = value_ind (vtbl); - - /* Index into the virtual function table. This is hard-coded because - looking up a field is not cheap, and it may be important to save - time, e.g. if the user has set a conditional breakpoint calling - a virtual function. */ - entry = value_subscript (vtbl, vi); - } - else - { - /* Handle the case where the vtbl field points directly to a structure. */ - vtbl = value_add (vtbl, vi); - entry = value_ind (vtbl); - } - - entry_type = check_typedef (VALUE_TYPE (entry)); - - if (TYPE_CODE (entry_type) == TYPE_CODE_STRUCT) - { - /* Move the `this' pointer according to the virtual function table. */ - VALUE_OFFSET (arg1) += value_as_long (value_field (entry, 0)); - - if (! VALUE_LAZY (arg1)) - { - VALUE_LAZY (arg1) = 1; - value_fetch_lazy (arg1); - } - vfn = value_field (entry, 2); - } - else if (TYPE_CODE (entry_type) == TYPE_CODE_PTR) - vfn = entry; - else - error ("I'm confused: virtual function table has bad type"); - /* Reinstantiate the function pointer with the correct type. */ - VALUE_TYPE (vfn) = lookup_pointer_type (TYPE_FN_FIELD_TYPE (f, j)); + if (arg1p) + { + if (type != VALUE_TYPE (*arg1p)) + *arg1p = value_ind (value_cast (lookup_pointer_type (type), + value_addr (*arg1p))); - *arg1p = arg1; - return vfn; + /* Move the `this' pointer according to the offset. + VALUE_OFFSET (*arg1p) += offset; + */ } + + return v; } /* ARG is a pointer to an object we know to be at least @@ -1101,20 +1027,20 @@ value_virtual_fn_field (arg1p, f, j, type, offset) return the most derived type we find. The caller must be satisfied when the return value == DTYPE. - FIXME-tiemann: should work with dossier entries as well. */ + FIXME-tiemann: should work with dossier entries as well. + NOTICE - djb: I see no good reason at all to keep this function now that + we have RTTI support. It's used in literally one place, and it's + hard to keep this function up to date when it's purpose is served + by value_rtti_type efficiently. + Consider it gone for 5.1. */ -static value_ptr -value_headof (in_arg, btype, dtype) - value_ptr in_arg; - struct type *btype, *dtype; +static struct value * +value_headof (struct value *in_arg, struct type *btype, struct type *dtype) { /* First collect the vtables we must look at for this object. */ - /* FIXME-tiemann: right now, just look at top-most vtable. */ - value_ptr arg, vtbl, entry, best_entry = 0; - int i, nelems; - int offset, best_offset = 0; + struct value *arg; + struct value *vtbl; struct symbol *sym; - CORE_ADDR pc_for_sym; char *demangled_name; struct minimal_symbol *msymbol; @@ -1122,71 +1048,45 @@ value_headof (in_arg, btype, dtype) CHECK_TYPEDEF (btype); arg = in_arg; if (btype != dtype) - arg = value_cast (lookup_pointer_type (btype), arg); + arg = value_cast (lookup_pointer_type (btype), arg); + if (TYPE_CODE (VALUE_TYPE (arg)) == TYPE_CODE_REF) + { + /* + * Copy the value, but change the type from (T&) to (T*). + * We keep the same location information, which is efficient, + * and allows &(&X) to get the location containing the reference. + */ + arg = value_copy (arg); + VALUE_TYPE (arg) = lookup_pointer_type (TYPE_TARGET_TYPE (VALUE_TYPE (arg))); + } + if (VALUE_ADDRESS(value_field (value_ind(arg), TYPE_VPTR_FIELDNO (btype)))==0) + return arg; + vtbl = value_ind (value_field (value_ind (arg), TYPE_VPTR_FIELDNO (btype))); + /* Turn vtable into typeinfo function */ + VALUE_OFFSET(vtbl)+=4; - /* Check that VTBL looks like it points to a virtual function table. */ - msymbol = lookup_minimal_symbol_by_pc (VALUE_ADDRESS (vtbl)); + msymbol = lookup_minimal_symbol_by_pc ( value_as_address(value_ind(vtbl)) ); if (msymbol == NULL - || (demangled_name = SYMBOL_NAME (msymbol)) == NULL - || !VTBL_PREFIX_P (demangled_name)) - { - /* If we expected to find a vtable, but did not, let the user - know that we aren't happy, but don't throw an error. - FIXME: there has to be a better way to do this. */ - struct type *error_type = (struct type *)xmalloc (sizeof (struct type)); - memcpy (error_type, VALUE_TYPE (in_arg), sizeof (struct type)); - TYPE_NAME (error_type) = savestring ("suspicious *", sizeof ("suspicious *")); - VALUE_TYPE (in_arg) = error_type; - return in_arg; - } + || (demangled_name = SYMBOL_NAME (msymbol)) == NULL) + { + /* If we expected to find a vtable, but did not, let the user + know that we aren't happy, but don't throw an error. + FIXME: there has to be a better way to do this. */ + struct type *error_type = (struct type *) xmalloc (sizeof (struct type)); + memcpy (error_type, VALUE_TYPE (in_arg), sizeof (struct type)); + TYPE_NAME (error_type) = savestring ("suspicious *", sizeof ("suspicious *")); + VALUE_TYPE (in_arg) = error_type; + return in_arg; + } + demangled_name = cplus_demangle(demangled_name,DMGL_ANSI); + *(strchr (demangled_name, ' ')) = '\0'; - /* Now search through the virtual function table. */ - entry = value_ind (vtbl); - nelems = longest_to_int (value_as_long (value_field (entry, 2))); - for (i = 1; i <= nelems; i++) - { - entry = value_subscript (vtbl, value_from_longest (builtin_type_int, - (LONGEST) i)); - /* This won't work if we're using thunks. */ - if (TYPE_CODE (check_typedef (VALUE_TYPE (entry))) != TYPE_CODE_STRUCT) - break; - offset = longest_to_int (value_as_long (value_field (entry, 0))); - /* If we use '<=' we can handle single inheritance - * where all offsets are zero - just use the first entry found. */ - if (offset <= best_offset) - { - best_offset = offset; - best_entry = entry; - } - } - /* Move the pointer according to BEST_ENTRY's offset, and figure - out what type we should return as the new pointer. */ - if (best_entry == 0) - { - /* An alternative method (which should no longer be necessary). - * But we leave it in for future use, when we will hopefully - * have optimizes the vtable to use thunks instead of offsets. */ - /* Use the name of vtable itself to extract a base type. */ - demangled_name += 4; /* Skip _vt$ prefix. */ - } - else - { - pc_for_sym = value_as_pointer (value_field (best_entry, 2)); - sym = find_pc_function (pc_for_sym); - demangled_name = cplus_demangle (SYMBOL_NAME (sym), DMGL_ANSI); - *(strchr (demangled_name, ':')) = '\0'; - } sym = lookup_symbol (demangled_name, 0, VAR_NAMESPACE, 0, 0); if (sym == NULL) - error ("could not find type declaration for `%s'", demangled_name); - if (best_entry) - { - free (demangled_name); - arg = value_add (value_cast (builtin_type_int, arg), - value_field (best_entry, 0)); - } - else arg = in_arg; + error ("could not find type declaration for `%s'", demangled_name); + + arg = in_arg; VALUE_TYPE (arg) = lookup_pointer_type (SYMBOL_TYPE (sym)); return arg; } @@ -1196,10 +1096,8 @@ value_headof (in_arg, btype, dtype) of its baseclasses) to figure out the most derived type that ARG could actually be a pointer to. */ -value_ptr -value_from_vtable_info (arg, type) - value_ptr arg; - struct type *type; +struct value * +value_from_vtable_info (struct value *arg, struct type *type) { /* Take care of preliminaries. */ if (TYPE_VPTR_FIELDNO (type) < 0) @@ -1209,107 +1107,6 @@ value_from_vtable_info (arg, type) return value_headof (arg, 0, type); } - -/* Return true if the INDEXth field of TYPE is a virtual baseclass - pointer which is for the base class whose type is BASECLASS. */ - -static int -vb_match (type, index, basetype) - struct type *type; - int index; - struct type *basetype; -{ - struct type *fieldtype; - char *name = TYPE_FIELD_NAME (type, index); - char *field_class_name = NULL; - - if (*name != '_') - return 0; - /* gcc 2.4 uses _vb$. */ - if (name[1] == 'v' && name[2] == 'b' && is_cplus_marker (name[3])) - field_class_name = name + 4; - /* gcc 2.5 will use __vb_. */ - if (name[1] == '_' && name[2] == 'v' && name[3] == 'b' && name[4] == '_') - field_class_name = name + 5; - - if (field_class_name == NULL) - /* This field is not a virtual base class pointer. */ - return 0; - - /* It's a virtual baseclass pointer, now we just need to find out whether - it is for this baseclass. */ - fieldtype = TYPE_FIELD_TYPE (type, index); - if (fieldtype == NULL - || TYPE_CODE (fieldtype) != TYPE_CODE_PTR) - /* "Can't happen". */ - return 0; - - /* What we check for is that either the types are equal (needed for - nameless types) or have the same name. This is ugly, and a more - elegant solution should be devised (which would probably just push - the ugliness into symbol reading unless we change the stabs format). */ - if (TYPE_TARGET_TYPE (fieldtype) == basetype) - return 1; - - if (TYPE_NAME (basetype) != NULL - && TYPE_NAME (TYPE_TARGET_TYPE (fieldtype)) != NULL - && STREQ (TYPE_NAME (basetype), - TYPE_NAME (TYPE_TARGET_TYPE (fieldtype)))) - return 1; - return 0; -} - -/* Compute the offset of the baseclass which is - the INDEXth baseclass of class TYPE, - for value at VALADDR (in host) at ADDRESS (in target). - The result is the offset of the baseclass value relative - to (the address of)(ARG) + OFFSET. - - -1 is returned on error. */ - -int -baseclass_offset (type, index, valaddr, address) - struct type *type; - int index; - char *valaddr; - CORE_ADDR address; -{ - struct type *basetype = TYPE_BASECLASS (type, index); - - if (BASETYPE_VIA_VIRTUAL (type, index)) - { - /* Must hunt for the pointer to this virtual baseclass. */ - register int i, len = TYPE_NFIELDS (type); - register int n_baseclasses = TYPE_N_BASECLASSES (type); - - /* First look for the virtual baseclass pointer - in the fields. */ - for (i = n_baseclasses; i < len; i++) - { - if (vb_match (type, i, basetype)) - { - CORE_ADDR addr - = unpack_pointer (TYPE_FIELD_TYPE (type, i), - valaddr + (TYPE_FIELD_BITPOS (type, i) / 8)); - - return addr - (LONGEST) address; - } - } - /* Not in the fields, so try looking through the baseclasses. */ - for (i = index+1; i < n_baseclasses; i++) - { - int boffset = - baseclass_offset (type, i, valaddr, address); - if (boffset) - return boffset; - } - /* Not found. */ - return -1; - } - - /* Baseclass is easily computed. */ - return TYPE_BASECLASS_BITPOS (type, index) / 8; -} /* Unpack a field FIELDNO of the specified TYPE, from the anonymous object at VALADDR. @@ -1326,10 +1123,7 @@ baseclass_offset (type, index, valaddr, address) If the field is signed, we also do sign extension. */ LONGEST -unpack_field_as_long (type, valaddr, fieldno) - struct type *type; - char *valaddr; - int fieldno; +unpack_field_as_long (struct type *type, char *valaddr, int fieldno) { ULONGEST val; ULONGEST valmask; @@ -1374,10 +1168,7 @@ unpack_field_as_long (type, valaddr, fieldno) indicate which bits (in target bit order) comprise the bitfield. */ void -modify_field (addr, fieldval, bitpos, bitsize) - char *addr; - LONGEST fieldval; - int bitpos, bitsize; +modify_field (char *addr, LONGEST fieldval, int bitpos, int bitsize) { LONGEST oword; @@ -1389,10 +1180,10 @@ modify_field (addr, fieldval, bitpos, bitsize) /* Warn if value is too big to fit in the field in question. */ if (bitsize < (8 * (int) sizeof (fieldval)) - && 0 != (fieldval & ~((1<<bitsize)-1))) + && 0 != (fieldval & ~((1 << bitsize) - 1))) { /* FIXME: would like to include fieldval in the message, but - we don't have a sprintf_longest. */ + we don't have a sprintf_longest. */ warning ("Value does not fit in %d bits.", bitsize); /* Truncate it, otherwise adjoining fields may be corrupted. */ @@ -1407,9 +1198,9 @@ modify_field (addr, fieldval, bitpos, bitsize) /* Mask out old value, while avoiding shifts >= size of oword */ if (bitsize < 8 * (int) sizeof (oword)) - oword &= ~(((((ULONGEST)1) << bitsize) - 1) << bitpos); + oword &= ~(((((ULONGEST) 1) << bitsize) - 1) << bitpos); else - oword &= ~((~(ULONGEST)0) << bitpos); + oword &= ~((~(ULONGEST) 0) << bitpos); oword |= fieldval << bitpos; store_signed_integer (addr, sizeof oword, oword); @@ -1417,15 +1208,13 @@ modify_field (addr, fieldval, bitpos, bitsize) /* Convert C numbers into newly allocated values */ -value_ptr -value_from_longest (type, num) - struct type *type; - register LONGEST num; +struct value * +value_from_longest (struct type *type, register LONGEST num) { - register value_ptr val = allocate_value (type); + struct value *val = allocate_value (type); register enum type_code code; register int len; - retry: +retry: code = TYPE_CODE (type); len = TYPE_LENGTH (type); @@ -1441,33 +1230,66 @@ value_from_longest (type, num) case TYPE_CODE_RANGE: store_signed_integer (VALUE_CONTENTS_RAW (val), len, num); break; - + case TYPE_CODE_REF: case TYPE_CODE_PTR: - /* This assumes that all pointers of a given length - have the same form. */ - store_address (VALUE_CONTENTS_RAW (val), len, (CORE_ADDR) num); + store_typed_address (VALUE_CONTENTS_RAW (val), type, (CORE_ADDR) num); break; - + default: error ("Unexpected type (%d) encountered for integer constant.", code); } return val; } -value_ptr -value_from_double (type, num) - struct type *type; - DOUBLEST num; + +/* Create a value representing a pointer of type TYPE to the address + ADDR. */ +struct value * +value_from_pointer (struct type *type, CORE_ADDR addr) { - register value_ptr val = allocate_value (type); + struct value *val = allocate_value (type); + store_typed_address (VALUE_CONTENTS_RAW (val), type, addr); + return val; +} + + +/* Create a value for a string constant to be stored locally + (not in the inferior's memory space, but in GDB memory). + This is analogous to value_from_longest, which also does not + use inferior memory. String shall NOT contain embedded nulls. */ + +struct value * +value_from_string (char *ptr) +{ + struct value *val; + int len = strlen (ptr); + int lowbound = current_language->string_lower_bound; + struct type *rangetype = + create_range_type ((struct type *) NULL, + builtin_type_int, + lowbound, len + lowbound - 1); + struct type *stringtype = + create_array_type ((struct type *) NULL, + *current_language->string_char_type, + rangetype); + + val = allocate_value (stringtype); + memcpy (VALUE_CONTENTS_RAW (val), ptr, len); + return val; +} + +struct value * +value_from_double (struct type *type, DOUBLEST num) +{ + struct value *val = allocate_value (type); struct type *base_type = check_typedef (type); register enum type_code code = TYPE_CODE (base_type); register int len = TYPE_LENGTH (base_type); if (code == TYPE_CODE_FLT) { - store_floating (VALUE_CONTENTS_RAW (val), len, num); + store_typed_floating (VALUE_CONTENTS_RAW (val), base_type, num); } else error ("Unexpected type encountered for floating constant."); @@ -1489,25 +1311,22 @@ value_from_double (type, num) 0 when it is using the value returning conventions (this often means returning pointer to where structure is vs. returning value). */ -value_ptr -value_being_returned (valtype, retbuf, struct_return) - register struct type *valtype; - char retbuf[REGISTER_BYTES]; - int struct_return; - /*ARGSUSED*/ +/* ARGSUSED */ +struct value * +value_being_returned (struct type *valtype, char *retbuf, int struct_return) { - register value_ptr val; + struct value *val; CORE_ADDR addr; -#if defined (EXTRACT_STRUCT_VALUE_ADDRESS) /* If this is not defined, just use EXTRACT_RETURN_VALUE instead. */ - if (struct_return) { - addr = EXTRACT_STRUCT_VALUE_ADDRESS (retbuf); - if (!addr) - error ("Function return value unknown"); - return value_at (valtype, addr, NULL); - } -#endif + if (EXTRACT_STRUCT_VALUE_ADDRESS_P ()) + if (struct_return) + { + addr = EXTRACT_STRUCT_VALUE_ADDRESS (retbuf); + if (!addr) + error ("Function return value unknown."); + return value_at (valtype, addr, NULL); + } val = allocate_value (valtype); CHECK_TYPEDEF (valtype); @@ -1532,29 +1351,15 @@ value_being_returned (valtype, retbuf, struct_return) handled wrong. */ int -generic_use_struct_convention (gcc_p, value_type) - int gcc_p; - struct type *value_type; -{ +generic_use_struct_convention (int gcc_p, struct type *value_type) +{ return !((gcc_p == 1) - && (TYPE_LENGTH (value_type) == 1 - || TYPE_LENGTH (value_type) == 2 - || TYPE_LENGTH (value_type) == 4 - || TYPE_LENGTH (value_type) == 8)); + && (TYPE_LENGTH (value_type) == 1 + || TYPE_LENGTH (value_type) == 2 + || TYPE_LENGTH (value_type) == 4 + || TYPE_LENGTH (value_type) == 8)); } -#ifndef USE_STRUCT_CONVENTION -#define USE_STRUCT_CONVENTION(gcc_p,type) generic_use_struct_convention (gcc_p, type) -#endif - -/* Some fundamental types (such as long double) are returned on the stack for - certain architectures. This macro should return true for any type besides - struct, union or array that gets returned on the stack. */ - -#ifndef RETURN_VALUE_ON_STACK -#define RETURN_VALUE_ON_STACK(TYPE) 0 -#endif - /* Return true if the function specified is using the structure returning convention on this machine to return arguments, or 0 if it is using the value returning convention. FUNCTION is the value representing @@ -1562,13 +1367,10 @@ generic_use_struct_convention (gcc_p, value_type) is the type returned by the function. GCC_P is nonzero if compiled with GCC. */ +/* ARGSUSED */ int -using_struct_return (function, funcaddr, value_type, gcc_p) - value_ptr function; - CORE_ADDR funcaddr; - struct type *value_type; - int gcc_p; - /*ARGSUSED*/ +using_struct_return (struct value *function, CORE_ADDR funcaddr, + struct type *value_type, int gcc_p) { register enum type_code code = TYPE_CODE (value_type); @@ -1589,8 +1391,7 @@ using_struct_return (function, funcaddr, value_type, gcc_p) function wants to return. */ void -set_return_value (val) - value_ptr val; +set_return_value (struct value *val) { struct type *type = check_typedef (VALUE_TYPE (val)); register enum type_code code = TYPE_CODE (type); @@ -1598,7 +1399,7 @@ set_return_value (val) if (code == TYPE_CODE_ERROR) error ("Function return type unknown."); - if ( code == TYPE_CODE_STRUCT + if (code == TYPE_CODE_STRUCT || code == TYPE_CODE_UNION) /* FIXME, implement struct return. */ error ("GDB does not support specifying a struct or union return value."); @@ -1606,10 +1407,10 @@ set_return_value (val) } void -_initialize_values () +_initialize_values (void) { add_cmd ("convenience", no_class, show_convenience, - "Debugger convenience (\"$foo\") variables.\n\ + "Debugger convenience (\"$foo\") variables.\n\ These variables are created when you assign them values;\n\ thus, \"print $foo=1\" gives \"$foo\" the value 1. Values may be any type.\n\n\ A few convenience variables are given values automatically:\n\ |
