1999-04-16 03:35:26 +02:00
|
|
|
|
/* Perform non-arithmetic operations on values, for GDB.
|
2002-01-04 06:20:09 +01:00
|
|
|
|
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
2002-01-04 06:20:09 +01:00
|
|
|
|
Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "inferior.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "demangle.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "gdbcmd.h"
|
2001-03-01 02:39:22 +01:00
|
|
|
|
#include "regcache.h"
|
(Changes from Daniel Berlin, with revisions by Jim Blandy.)
Abstract out operations specific to particular C++ ABI's, and
invoke them through a function table. This removes the C++ ABI
dependencies scattered throughout the code, and allows us to
cleanly add support for new C++ ABI's.
* cp-abi.h, cp-abi.h, gnu-v2-abi.c, hpacc-abi.c: New files.
* c-typeprint.c, c-valprint.c, dbxread.c, eval.c, gdbtypes.c,
jv-typeprint.c, linespec.c, symtab.c, typeprint.c, valops.c:
#include "cp-abi.h". These files all use functions now declared
there.
* symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P):
Deleted. These services are now provided by functions declared in
cp-abi.h.
* value.h (value_rtti_type, value_virtual_fn_field): Same.
* values.c (value_virtual_fn_field): Same, for this definition.
* valops.c (value_rtti_type): Same.
* c-typeprint.c (c_type_print_base): Use the functions from
"cp-abi.h", instead of the old macros, or hard-coded ABI-specific
tests.
* dbxread.c (record_minimal_symbol): Same.
* gdbtypes.c (get_destructor_fn_field, virtual_base_index,
virtual_base_index_skip_primaries): Same.
* jv-typeprint.c (java_type_print_base): Same.
* linespec.c (find_methods, decode_line_1): Same.
* symtab.c (gdb_mangle_name): Same.
* Makefile.in (SFILES): Add the new .c files mentioned above.
(cp_abi_h): New variable.
(COMMON_OBS): Add gnu-v2-abi.o, hpacc-abi.o, and cp-abi.o.
(cp-abi.o, gnu-v2-abi.o, hpacc-abi.o): New targets.
(c-typeprint.o, c-valprint.o, dbxread.o, eval.o, gdbtypes.o,
jv-typeprint.o, symtab.o, linespec.o, typeprint.o, valops.o): Add
dependency on $(cp_abi_h).
2001-04-27 02:19:09 +02:00
|
|
|
|
#include "cp-abi.h"
|
2003-02-19 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add block.c.
(block_h): New.
(COMMON_OBS): Add block.o.
(block.o): New.
(x86-64-tdep.o): Add $(block_h).
(values.o, valops.o, tracepoint.o, symtab.o, symmisc.o, symfile.o)
(stack.o, printcmd.o, p-exp.tab.o, parse.o, objfiles.o)
(objc-exp.tab.o, objc-lang.o, nlmread.o, mips-tdep.o, mdebugread.o)
(m2-exp.tab.o, linespec.o, jv-lang.o, jv-exp.tab.o, infcmd.o)
(f-valprint.o, findvar.o, f-exp.tab.o, expprint.o, coffread.o)
(c-exp.tab.o, buildsym.o, breakpoint.o, blockframe.o, ax-gdb.o)
(alpha-tdep.o, ada-lang.o, ada-exp.tab.o, mi-cmd-stack.o): Ditto.
* value.h: Add opaque declaration for struct block.
* parser-defs.h, objc-lang.h, buildsym.h, breakpoint.h: Ditto.
* ada-lang.h: Ditto.
* x86-64-tdep.c: #include "block.h"
* values.c, valops.c, tracepoint.c, symtab.c, symmisc.c: Ditto.
* symfile.c, stack.c, printcmd.c, p-exp.y, parse.c: Ditto.
* objfiles.c, objc-exp.y, objc-lang.c, nlmread.c: Ditto.
* mips-tdep.c, mdebugread.c, m2-exp.y, linespec.c: Ditto.
* jv-lang.c, jv-exp.y, infcmd.c, f-valprint.c: Ditto.
* findvar.c, f-exp.y, expprint.c, coffread.c, c-exp.y: Ditto.
* buildsym.c, breakpoint.c, blockframe.c, ax-gdb.c: Ditto.
* alpha-tdep.c, ada-lang.c, ada-exp.y: Ditto.
* blockframe.c (blockvector_for_pc_sect): Move to "block.c".
(blockvector_for_pc, block_for_pc_sect, block_for_pc): Ditto.
* symtab.c (block_function): Ditto.
(contained_in): Ditto.
* frame.h: Move block_for_pc and block_for_pc_sect declarations to
block.h. Add opaque declaration for struct block.
* symtab.h: Move block_function and contained_in declarations to
block.h. Add opaque declarations for struct block, struct
blockvector.
(struct block): Move to block.h.
(struct blockvector): Ditto.
(BLOCK_START, BLOCK_END, BLOCK_FUNCTION, BLOCK_SUPERBLOCK)
(BLOCK_GCC_COMPILED, BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM)
(BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE)
(ALL_BLOCK_SYMBOLS, BLOCK_SHOULD_SORT, BLOCKVECTOR_NBLOCKS)
(BLOCKVECTOR_BLOCK, GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK):
Ditto.
* block.c: New file.
* block.h: New file.
2003-02-19 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: #include "block.h"
2003-02-20 01:01:07 +01:00
|
|
|
|
#include "block.h"
|
2003-04-21 Andrew Cagney <cagney@redhat.com>
* infcall.c: New file.
* infcall.h: New file.
* valarith.c: Include "infcall.h".
* scm-lang.c, objc-lang.cm, hppa-tdep.c, gcore.c: Ditto.
* eval.c, ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (valarith.o, scm-lang.o): Update dependencies.
(objc-lang.o, hppa-tdep.o, gcore.o): Update dependencies.
(eval.o, ada-valprint.o, ada-lang.o): Update dependencies.
(SFILES): Add "infcall.c"
(COMMON_OBS): Add "infcall.o".
(infcall.o): Specify dependencies.
* value.h (call_function_by_hand): Delete declaration.
* inferior.h (run_stack_dummy): Delete declaration.
* infcmd.c (breakpoint_auto_delete_contents): Move to "infcall.c".
(run_stack_dummy): Move to "infcall.c", merged into
call_function_by_hand.
* valops.c (call_function_by_hand): Moved to "infcall.c".
(find_function_addr, value_arg_coerce): Ditto.
(unwindonsignal_p, coerce_float_to_double): Ditto.
(_initialize_valops): Move "set/show coerce-float-to-double", and
"set/show unwindonsignal" commands to "infcall.c".
* v850-tdep.c, target.h: Update comments.
* sparc-tdep.c (sparc_fix_call_dummy): Update comments.
* sh-tdep.c (sh_init_extra_frame_info): Update comments.
(sh64_init_extra_frame_info): Update comments.
* mn10300-tdep.c: Update comments.
* mcore-tdep.c (mcore_init_extra_frame_info): Update comments.
* config/sparc/tm-sparc.h: Update comments.
* breakpoint.h: Update comments.
* avr-tdep.c (avr_init_extra_frame_info): Update comments.
* arm-tdep.c: Update comment.
2003-04-21 18:48:41 +02:00
|
|
|
|
#include "infcall.h"
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
#include "dictionary.h"
|
2003-06-12 David Carlton <carlton@bactrian.org>
* symtab.h: Delete declaration of make_symbol_overload_list.
Add declaration of lookup_partial_symbol.
* symtab.c (remove_params): Move to cp-support.c.
(overload_list_add_symbol, make_symbol_overload_list)
(sym_return_val_size, sym_return_val_index): Ditto.
(lookup_partial_symbol): Make extern.
* cp-support.h: Add declaration of make_symbol_overload_list.
* cp-support.c: Include dictionary.h, objfiles.h, frame.h,
symtab.h, and block.h.
(remove_params): Move here from symtab.c.
(overload_list_add_symbol, make_symbol_overload_list)
(sym_return_val_size, sym_return_val_index): Ditto.
* valops.c: Include cp-support.h.
* Makefile.in (cp-support.o): Depend on dictionary_h, objfiles_h,
frame_h, and block_h.
(valops.o): Depend on cp_support_h.
2003-06-12 17:33:45 +02:00
|
|
|
|
#include "cp-support.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include "gdb_string.h"
|
2002-05-12 04:20:38 +02:00
|
|
|
|
#include "gdb_assert.h"
|
2003-09-25 18:39:39 +02:00
|
|
|
|
#include "cp-support.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Flag indicating HP compilers were used; needed to correctly handle some
|
|
|
|
|
value operations with HP aCC code/runtime. */
|
|
|
|
|
extern int hp_som_som_object_present;
|
|
|
|
|
|
2000-04-04 06:53:50 +02:00
|
|
|
|
extern int overload_debug;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Local functions. */
|
|
|
|
|
|
2002-06-14 16:34:26 +02:00
|
|
|
|
static int typecmp (int staticp, int varargs, int nargs,
|
|
|
|
|
struct field t1[], struct value *t2[]);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static CORE_ADDR value_push (CORE_ADDR, struct value *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *search_struct_field (char *, struct value *, int,
|
2000-05-28 03:12:42 +02:00
|
|
|
|
struct type *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *search_struct_method (char *, struct value **,
|
|
|
|
|
struct value **,
|
2000-05-28 03:12:42 +02:00
|
|
|
|
int, int *, struct type *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
static int find_oload_champ_namespace (struct type **arg_types, int nargs,
|
|
|
|
|
const char *func_name,
|
|
|
|
|
const char *qualified_name,
|
|
|
|
|
struct symbol ***oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv);
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
int find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
|
|
|
|
|
const char *func_name,
|
|
|
|
|
const char *qualified_name,
|
|
|
|
|
int namespace_len,
|
|
|
|
|
struct symbol ***oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv,
|
|
|
|
|
int *oload_champ);
|
|
|
|
|
|
|
|
|
|
static int find_oload_champ (struct type **arg_types, int nargs, int method,
|
|
|
|
|
int num_fns,
|
|
|
|
|
struct fn_field *fns_ptr,
|
|
|
|
|
struct symbol **oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv);
|
|
|
|
|
|
|
|
|
|
static int oload_method_static (int method, struct fn_field *fns_ptr,
|
|
|
|
|
int index);
|
|
|
|
|
|
|
|
|
|
enum oload_classification { STANDARD, NON_STANDARD, INCOMPATIBLE };
|
|
|
|
|
|
|
|
|
|
static enum
|
|
|
|
|
oload_classification classify_oload_match (struct badness_vector
|
|
|
|
|
* oload_champ_bv,
|
|
|
|
|
int nargs,
|
|
|
|
|
int static_offset);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int check_field_in (struct type *, const char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-09-25 18:39:39 +02:00
|
|
|
|
static struct value *value_struct_elt_for_reference (struct type *domain,
|
|
|
|
|
int offset,
|
|
|
|
|
struct type *curtype,
|
|
|
|
|
char *name,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
struct type *intype,
|
|
|
|
|
enum noside noside);
|
2003-09-25 18:39:39 +02:00
|
|
|
|
|
|
|
|
|
static struct value *value_namespace_elt (const struct type *curtype,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
char *name,
|
2003-09-25 18:39:39 +02:00
|
|
|
|
enum noside noside);
|
|
|
|
|
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
static struct value *value_maybe_namespace_elt (const struct type *curtype,
|
|
|
|
|
char *name,
|
|
|
|
|
enum noside noside);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static CORE_ADDR allocate_space_in_inferior (int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *cast_into_complex (struct type *, struct value *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct fn_field *find_method_list (struct value ** argp, char *method,
|
2002-05-12 04:20:38 +02:00
|
|
|
|
int offset,
|
2000-05-28 03:12:42 +02:00
|
|
|
|
struct type *type, int *num_fns,
|
|
|
|
|
struct type **basetype,
|
|
|
|
|
int *boffset);
|
1999-04-26 20:34:20 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
void _initialize_valops (void);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Flag for whether we want to abandon failed expression evals by default. */
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
static int auto_abandon = 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
int overload_resolution = 0;
|
2000-02-23 16:53:33 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Find the address of function name NAME in the inferior. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2002-09-13 02:18:33 +02:00
|
|
|
|
find_function_in_inferior (const char *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct symbol *sym;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
sym = lookup_symbol (name, 0, VAR_DOMAIN, 0, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_CLASS (sym) != LOC_BLOCK)
|
|
|
|
|
{
|
|
|
|
|
error ("\"%s\" exists in this program but is not a function.",
|
|
|
|
|
name);
|
|
|
|
|
}
|
|
|
|
|
return value_of_variable (sym, NULL);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct minimal_symbol *msymbol = lookup_minimal_symbol (name, NULL, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (msymbol != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
* gdbarch.sh (POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Two new
functions which architectures can redefine, defaulting to
generic_pointer_to_address and generic_address_to_pointer.
* findvar.c (extract_typed_address, store_typed_address,
generic_pointer_to_address, generic_address_to_pointer): New
functions.
(POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Provide default
definitions.
(extract_address, store_address): Doc fixes.
* values.c (value_as_pointer): Doc fix.
(value_from_pointer): New function.
* defs.h (extract_typed_address, store_typed_address): New
declarations.
* inferior.h (generic_address_to_pointer,
generic_pointer_to_address): New declarations.
* value.h (value_from_pointer): New declaration.
* ax-gdb.c (const_var_ref): Use value_from_pointer, not
value_from_longest.
* blockframe.c (generic_push_dummy_frame): Use read_pc and
read_sp, not read_register.
* c-valprint.c (c_val_print): Use extract_typed_address instead of
extract_address to extract vtable entries and references.
* cp-valprint.c (cp_print_value_fields): Use value_from_pointer
instead of value_from_longest to extract the vtable's address.
* eval.c (evaluate_subexp_standard): Use value_from_pointer
instead of value_from_longest to compute `this', and for doing
pointer-to-member dereferencing.
* findvar.c (read_register): Use extract_unsigned_integer, not
extract_address.
(read_var_value): Use store_typed_address instead of store_address
for building label values.
(locate_var_value): Use value_from_pointer instead of
value_from_longest.
* hppa-tdep.c (find_stub_with_shl_get): Use value_from_pointer,
instead of value_from_longest, to build arguments to __d_shl_get.
* printcmd.c (set_next_address): Use value_from_pointer, not
value_from_longest.
(x_command): Use value_from_pointer, not value_from_longest.
* tracepoint.c (set_traceframe_context): Use value_from_pointer,
not value_from_longest.
* valarith.c (value_add, value_sub): Use value_from_pointer, not
value_from_longest.
* valops.c (find_function_in_inferior, value_coerce_array,
value_coerce_function, value_addr, hand_function_call): Same.
* value.h (COERCE_REF): Use unpack_pointer, not unpack_long.
* values.c (unpack_long): Use extract_typed_address to produce
addresses from pointers and references, not extract_address.
(value_from_longest): Use store_typed_address instead of
store_address to produce pointer and reference values.
2000-04-14 20:43:41 +02:00
|
|
|
|
CORE_ADDR maddr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
type = lookup_pointer_type (builtin_type_char);
|
|
|
|
|
type = lookup_function_type (type);
|
|
|
|
|
type = lookup_pointer_type (type);
|
* gdbarch.sh (POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Two new
functions which architectures can redefine, defaulting to
generic_pointer_to_address and generic_address_to_pointer.
* findvar.c (extract_typed_address, store_typed_address,
generic_pointer_to_address, generic_address_to_pointer): New
functions.
(POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Provide default
definitions.
(extract_address, store_address): Doc fixes.
* values.c (value_as_pointer): Doc fix.
(value_from_pointer): New function.
* defs.h (extract_typed_address, store_typed_address): New
declarations.
* inferior.h (generic_address_to_pointer,
generic_pointer_to_address): New declarations.
* value.h (value_from_pointer): New declaration.
* ax-gdb.c (const_var_ref): Use value_from_pointer, not
value_from_longest.
* blockframe.c (generic_push_dummy_frame): Use read_pc and
read_sp, not read_register.
* c-valprint.c (c_val_print): Use extract_typed_address instead of
extract_address to extract vtable entries and references.
* cp-valprint.c (cp_print_value_fields): Use value_from_pointer
instead of value_from_longest to extract the vtable's address.
* eval.c (evaluate_subexp_standard): Use value_from_pointer
instead of value_from_longest to compute `this', and for doing
pointer-to-member dereferencing.
* findvar.c (read_register): Use extract_unsigned_integer, not
extract_address.
(read_var_value): Use store_typed_address instead of store_address
for building label values.
(locate_var_value): Use value_from_pointer instead of
value_from_longest.
* hppa-tdep.c (find_stub_with_shl_get): Use value_from_pointer,
instead of value_from_longest, to build arguments to __d_shl_get.
* printcmd.c (set_next_address): Use value_from_pointer, not
value_from_longest.
(x_command): Use value_from_pointer, not value_from_longest.
* tracepoint.c (set_traceframe_context): Use value_from_pointer,
not value_from_longest.
* valarith.c (value_add, value_sub): Use value_from_pointer, not
value_from_longest.
* valops.c (find_function_in_inferior, value_coerce_array,
value_coerce_function, value_addr, hand_function_call): Same.
* value.h (COERCE_REF): Use unpack_pointer, not unpack_long.
* values.c (unpack_long): Use extract_typed_address to produce
addresses from pointers and references, not extract_address.
(value_from_longest): Use store_typed_address instead of
store_address to produce pointer and reference values.
2000-04-14 20:43:41 +02:00
|
|
|
|
maddr = SYMBOL_VALUE_ADDRESS (msymbol);
|
|
|
|
|
return value_from_pointer (type, maddr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!target_has_execution)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("evaluation of this expression requires the target program to be active");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
else
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("evaluation of this expression requires the program to have a function \"%s\".", name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate NBYTES of space in the inferior using the inferior's malloc
|
|
|
|
|
and return a value that is a pointer to the allocated space. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_allocate_space_in_inferior (int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *blocklen;
|
2002-09-13 02:38:48 +02:00
|
|
|
|
struct value *val = find_function_in_inferior (NAME_OF_MALLOC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
blocklen = value_from_longest (builtin_type_int, (LONGEST) len);
|
|
|
|
|
val = call_function_by_hand (val, 1, &blocklen);
|
|
|
|
|
if (value_logical_not (val))
|
|
|
|
|
{
|
|
|
|
|
if (!target_has_execution)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
error ("No memory available to program now: you need to start the target first");
|
|
|
|
|
else
|
|
|
|
|
error ("No memory available to program: call to malloc failed");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2000-07-30 03:48:28 +02:00
|
|
|
|
allocate_space_in_inferior (int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return value_as_long (value_allocate_space_in_inferior (len));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Cast value ARG2 to type TYPE and return as a value.
|
|
|
|
|
More general than a C cast: accepts any two types of the same length,
|
|
|
|
|
and if ARG2 is an lvalue it can be cast into anything at all. */
|
|
|
|
|
/* In C++, casts may change pointer or object representations. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_cast (struct type *type, struct value *arg2)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
enum type_code code1;
|
|
|
|
|
enum type_code code2;
|
|
|
|
|
int scalar;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type2;
|
|
|
|
|
|
|
|
|
|
int convert_to_boolean = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (VALUE_TYPE (arg2) == type)
|
|
|
|
|
return arg2;
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
code1 = TYPE_CODE (type);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
COERCE_REF (arg2);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
type2 = check_typedef (VALUE_TYPE (arg2));
|
|
|
|
|
|
|
|
|
|
/* A cast to an undetermined-length array_type, such as (TYPE [])OBJECT,
|
|
|
|
|
is treated like a cast to (TYPE [N])OBJECT,
|
|
|
|
|
where N is sizeof(OBJECT)/sizeof(TYPE). */
|
|
|
|
|
if (code1 == TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
|
|
|
|
struct type *element_type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
unsigned element_length = TYPE_LENGTH (check_typedef (element_type));
|
|
|
|
|
if (element_length > 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
&& TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *range_type = TYPE_INDEX_TYPE (type);
|
|
|
|
|
int val_length = TYPE_LENGTH (type2);
|
|
|
|
|
LONGEST low_bound, high_bound, new_length;
|
|
|
|
|
if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
|
|
|
|
|
low_bound = 0, high_bound = 0;
|
|
|
|
|
new_length = val_length / element_length;
|
|
|
|
|
if (val_length % element_length != 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
warning ("array element type size does not divide object size in cast");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* FIXME-type-allocation: need a way to free this type when we are
|
|
|
|
|
done with it. */
|
|
|
|
|
range_type = create_range_type ((struct type *) NULL,
|
|
|
|
|
TYPE_TARGET_TYPE (range_type),
|
|
|
|
|
low_bound,
|
|
|
|
|
new_length + low_bound - 1);
|
|
|
|
|
VALUE_TYPE (arg2) = create_array_type ((struct type *) NULL,
|
|
|
|
|
element_type, range_type);
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (current_language->c_style_arrays
|
|
|
|
|
&& TYPE_CODE (type2) == TYPE_CODE_ARRAY)
|
|
|
|
|
arg2 = value_coerce_array (arg2);
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type2) == TYPE_CODE_FUNC)
|
|
|
|
|
arg2 = value_coerce_function (arg2);
|
|
|
|
|
|
|
|
|
|
type2 = check_typedef (VALUE_TYPE (arg2));
|
|
|
|
|
COERCE_VARYING_ARRAY (arg2, type2);
|
|
|
|
|
code2 = TYPE_CODE (type2);
|
|
|
|
|
|
|
|
|
|
if (code1 == TYPE_CODE_COMPLEX)
|
|
|
|
|
return cast_into_complex (type, arg2);
|
|
|
|
|
if (code1 == TYPE_CODE_BOOL)
|
|
|
|
|
{
|
|
|
|
|
code1 = TYPE_CODE_INT;
|
|
|
|
|
convert_to_boolean = 1;
|
|
|
|
|
}
|
|
|
|
|
if (code1 == TYPE_CODE_CHAR)
|
|
|
|
|
code1 = TYPE_CODE_INT;
|
|
|
|
|
if (code2 == TYPE_CODE_BOOL || code2 == TYPE_CODE_CHAR)
|
|
|
|
|
code2 = TYPE_CODE_INT;
|
|
|
|
|
|
|
|
|
|
scalar = (code2 == TYPE_CODE_INT || code2 == TYPE_CODE_FLT
|
|
|
|
|
|| code2 == TYPE_CODE_ENUM || code2 == TYPE_CODE_RANGE);
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (code1 == TYPE_CODE_STRUCT
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& code2 == TYPE_CODE_STRUCT
|
|
|
|
|
&& TYPE_NAME (type) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Look in the type of the source to see if it contains the
|
2000-03-13 08:30:00 +01:00
|
|
|
|
type of the target as a superclass. If so, we'll need to
|
|
|
|
|
offset the object in addition to changing its type. */
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v = search_struct_field (type_name_no_tag (type),
|
1999-04-16 03:35:26 +02:00
|
|
|
|
arg2, 0, type2, 1);
|
|
|
|
|
if (v)
|
|
|
|
|
{
|
|
|
|
|
VALUE_TYPE (v) = type;
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (code1 == TYPE_CODE_FLT && scalar)
|
|
|
|
|
return value_from_double (type, value_as_double (arg2));
|
|
|
|
|
else if ((code1 == TYPE_CODE_INT || code1 == TYPE_CODE_ENUM
|
|
|
|
|
|| code1 == TYPE_CODE_RANGE)
|
|
|
|
|
&& (scalar || code2 == TYPE_CODE_PTR))
|
|
|
|
|
{
|
|
|
|
|
LONGEST longest;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
if (hp_som_som_object_present && /* if target compiled by HP aCC */
|
|
|
|
|
(code2 == TYPE_CODE_PTR))
|
|
|
|
|
{
|
|
|
|
|
unsigned int *ptr;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *retvalp;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (TYPE_TARGET_TYPE (type2)))
|
|
|
|
|
{
|
|
|
|
|
/* With HP aCC, pointers to data members have a bias */
|
|
|
|
|
case TYPE_CODE_MEMBER:
|
|
|
|
|
retvalp = value_from_longest (type, value_as_long (arg2));
|
2000-06-15 20:54:48 +02:00
|
|
|
|
/* force evaluation */
|
2000-07-15 19:40:30 +02:00
|
|
|
|
ptr = (unsigned int *) VALUE_CONTENTS (retvalp);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*ptr &= ~0x20000000; /* zap 29th bit to remove bias */
|
|
|
|
|
return retvalp;
|
|
|
|
|
|
|
|
|
|
/* While pointers to methods don't really point to a function */
|
|
|
|
|
case TYPE_CODE_METHOD:
|
|
|
|
|
error ("Pointers to methods not supported with HP aCC");
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break; /* fall out and go to normal handling */
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-07-10 23:15:28 +02:00
|
|
|
|
|
|
|
|
|
/* When we cast pointers to integers, we mustn't use
|
|
|
|
|
POINTER_TO_ADDRESS to find the address the pointer
|
|
|
|
|
represents, as value_as_long would. GDB should evaluate
|
|
|
|
|
expressions just as the compiler would --- and the compiler
|
|
|
|
|
sees a cast as a simple reinterpretation of the pointer's
|
|
|
|
|
bits. */
|
|
|
|
|
if (code2 == TYPE_CODE_PTR)
|
|
|
|
|
longest = extract_unsigned_integer (VALUE_CONTENTS (arg2),
|
|
|
|
|
TYPE_LENGTH (type2));
|
|
|
|
|
else
|
|
|
|
|
longest = value_as_long (arg2);
|
2000-07-15 19:40:30 +02:00
|
|
|
|
return value_from_longest (type, convert_to_boolean ?
|
2000-06-15 20:54:48 +02:00
|
|
|
|
(LONGEST) (longest ? 1 : 0) : longest);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2000-07-15 19:40:30 +02:00
|
|
|
|
else if (code1 == TYPE_CODE_PTR && (code2 == TYPE_CODE_INT ||
|
2000-08-30 02:58:58 +02:00
|
|
|
|
code2 == TYPE_CODE_ENUM ||
|
|
|
|
|
code2 == TYPE_CODE_RANGE))
|
2000-07-12 10:31:49 +02:00
|
|
|
|
{
|
2001-02-06 19:07:48 +01:00
|
|
|
|
/* TYPE_LENGTH (type) is the length of a pointer, but we really
|
|
|
|
|
want the length of an address! -- we are really dealing with
|
|
|
|
|
addresses (i.e., gdb representations) not pointers (i.e.,
|
|
|
|
|
target representations) here.
|
|
|
|
|
|
|
|
|
|
This allows things like "print *(int *)0x01000234" to work
|
|
|
|
|
without printing a misleading message -- which would
|
|
|
|
|
otherwise occur when dealing with a target having two byte
|
|
|
|
|
pointers and four byte addresses. */
|
|
|
|
|
|
|
|
|
|
int addr_bit = TARGET_ADDR_BIT;
|
|
|
|
|
|
2000-07-12 10:31:49 +02:00
|
|
|
|
LONGEST longest = value_as_long (arg2);
|
2001-02-06 19:07:48 +01:00
|
|
|
|
if (addr_bit < sizeof (LONGEST) * HOST_CHAR_BIT)
|
2000-07-12 10:31:49 +02:00
|
|
|
|
{
|
2001-02-06 19:07:48 +01:00
|
|
|
|
if (longest >= ((LONGEST) 1 << addr_bit)
|
|
|
|
|
|| longest <= -((LONGEST) 1 << addr_bit))
|
2000-07-12 10:31:49 +02:00
|
|
|
|
warning ("value truncated");
|
|
|
|
|
}
|
|
|
|
|
return value_from_longest (type, longest);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else if (TYPE_LENGTH (type) == TYPE_LENGTH (type2))
|
|
|
|
|
{
|
|
|
|
|
if (code1 == TYPE_CODE_PTR && code2 == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
struct type *t1 = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
struct type *t2 = check_typedef (TYPE_TARGET_TYPE (type2));
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_CODE (t1) == TYPE_CODE_STRUCT
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& TYPE_CODE (t2) == TYPE_CODE_STRUCT
|
|
|
|
|
&& !value_logical_not (arg2))
|
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Look in the type of the source to see if it contains the
|
2000-03-13 08:30:00 +01:00
|
|
|
|
type of the target as a superclass. If so, we'll need to
|
|
|
|
|
offset the pointer rather than just change its type. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_NAME (t1) != NULL)
|
|
|
|
|
{
|
|
|
|
|
v = search_struct_field (type_name_no_tag (t1),
|
|
|
|
|
value_ind (arg2), 0, t2, 1);
|
|
|
|
|
if (v)
|
|
|
|
|
{
|
|
|
|
|
v = value_addr (v);
|
|
|
|
|
VALUE_TYPE (v) = type;
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look in the type of the target to see if it contains the
|
2000-03-13 08:30:00 +01:00
|
|
|
|
type of the source as a superclass. If so, we'll need to
|
|
|
|
|
offset the pointer rather than just change its type.
|
|
|
|
|
FIXME: This fails silently with virtual inheritance. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_NAME (t2) != NULL)
|
|
|
|
|
{
|
|
|
|
|
v = search_struct_field (type_name_no_tag (t2),
|
1999-07-07 22:19:36 +02:00
|
|
|
|
value_zero (t1, not_lval), 0, t1, 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (v)
|
|
|
|
|
{
|
2002-08-21 19:24:31 +02:00
|
|
|
|
CORE_ADDR addr2 = value_as_address (arg2);
|
|
|
|
|
addr2 -= (VALUE_ADDRESS (v)
|
|
|
|
|
+ VALUE_OFFSET (v)
|
|
|
|
|
+ VALUE_EMBEDDED_OFFSET (v));
|
|
|
|
|
return value_from_pointer (type, addr2);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* No superclass found, just fall through to change ptr type. */
|
|
|
|
|
}
|
|
|
|
|
VALUE_TYPE (arg2) = type;
|
2001-05-19 17:20:14 +02:00
|
|
|
|
arg2 = value_change_enclosing_type (arg2, type);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
VALUE_POINTED_TO_OFFSET (arg2) = 0; /* pai: chk_val */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return arg2;
|
|
|
|
|
}
|
|
|
|
|
else if (VALUE_LVAL (arg2) == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
return value_at_lazy (type, VALUE_ADDRESS (arg2) + VALUE_OFFSET (arg2),
|
|
|
|
|
VALUE_BFD_SECTION (arg2));
|
|
|
|
|
}
|
|
|
|
|
else if (code1 == TYPE_CODE_VOID)
|
|
|
|
|
{
|
|
|
|
|
return value_zero (builtin_type_void, not_lval);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
error ("Invalid cast.");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a value of type TYPE that is zero, and return it. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_zero (struct type *type, enum lval_type lv)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val = allocate_value (type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
memset (VALUE_CONTENTS (val), 0, TYPE_LENGTH (check_typedef (type)));
|
|
|
|
|
VALUE_LVAL (val) = lv;
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-04 06:53:50 +02:00
|
|
|
|
/* Return a value with type TYPE located at ADDR.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
Call value_at only if the data needs to be fetched immediately;
|
|
|
|
|
if we can be 'lazy' and defer the fetch, perhaps indefinately, call
|
|
|
|
|
value_at_lazy instead. value_at_lazy simply records the address of
|
2000-04-04 06:53:50 +02:00
|
|
|
|
the data and sets the lazy-evaluation-required flag. The lazy flag
|
|
|
|
|
is tested in the VALUE_CONTENTS macro, which is used if and when
|
|
|
|
|
the contents are actually required.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
Note: value_at does *NOT* handle embedded offsets; perform such
|
|
|
|
|
adjustments before or after calling it. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_at (struct type *type, CORE_ADDR addr, asection *sect)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
|
|
|
|
|
error ("Attempt to dereference a generic pointer.");
|
|
|
|
|
|
|
|
|
|
val = allocate_value (type);
|
|
|
|
|
|
Clean up the D10V port so that GDB and the target program no
longer disagree on how big pointers are.
* findvar.c (value_from_register): Remove special case code for D10V.
* printcmd.c (print_frame_args): Same.
* valops.c (value_at, value_fetch_lazy): Same.
* values.c (unpack_long): Same.
* gdbarch.sh: Changes to effect the following:
* gdbarch.h (GDB_TARGET_IS_D10V, D10V_MAKE_DADDR,
gdbarch_d10v_make_daddr_ftype, gdbarch_d10v_make_daddr,
set_gdbarch_d10v_make_daddr, D10V_MAKE_IADDR,
gdbarch_d10v_make_iaddr_ftype, gdbarch_d10v_make_iaddr,
set_gdbarch_d10v_make_iaddr, D10V_DADDR_P,
gdbarch_d10v_daddr_p_ftype, gdbarch_d10v_daddr_p,
set_gdbarch_d10v_daddr_p, D10V_IADDR_P,
gdbarch_d10v_iaddr_p_ftype, gdbarch_d10v_iaddr_p,
set_gdbarch_d10v_iaddr_p, D10V_CONVERT_DADDR_TO_RAW,
gdbarch_d10v_convert_daddr_to_raw_ftype,
gdbarch_d10v_convert_daddr_to_raw,
set_gdbarch_d10v_convert_daddr_to_raw, D10V_CONVERT_IADDR_TO_RAW,
gdbarch_d10v_convert_iaddr_to_raw_ftype,
gdbarch_d10v_convert_iaddr_to_raw,
set_gdbarch_d10v_convert_iaddr_to_raw): Delete declarations.
* gdbarch.c: Delete the corresponding definitions.
(struct gdbarch): Delete members d10v_make_daddr,
d10v_make_iaddr, d10v_daddr_p, d10v_iaddr_p,
d10v_convert_daddr_to_raw, and d10v_convert_iaddr_to_raw.
(startup_gdbarch): Remove initializers for the above.
(verify_gdbarch, gdbarch_dump): Don't verify or dump them any
more.
* d10v-tdep.c (d10v_register_virtual_type): Rather that
claiming the stack pointer and PC are 32 bits long (which they
aren't), say that the stack pointer is an int16_t, and the
program counter is a function pointer. This allows the rest
of GDB to make the appropriate conversions between the code
pointer format and real addresses.
(d10v_register_convertible, d10v_register_convert_to_virtual,
d10v_register_convert_to_raw): Delete function; no registers
are convertible now, so we use
generic_register_convertible_not instead.
(d10v_address_to_pointer, d10v_pointer_to_address): New gdbarch
methods.
(d10v_push_arguments, d10v_extract_return_value): Remove special
cases for code and data pointers.
(d10v_gdbarch_init): Set gdbarch_ptr_bit to 16, so that GDB and
the target agree on how large pointers are. Say that addresses
are 32 bits long. Register the address_to_pointer and
pointer_to_address conversion functions. Since no registers are
convertible now, register generic_register_convertible_not as the
gdbarch_register_convertible method instead of
d10v_register_convertible. Remove registrations for
d10v_register_convert_to_virtual,
d10v_register_convert_to_raw, gdbarch_d10v_make_daddr,
gdbarch_d10v_make_iaddr, gdbarch_d10v_daddr_p,
gdbarch_d10v_iaddr_p, gdbarch_d10v_convert_daddr_to_raw, and
gdbarch_d10v_convert_iaddr_to_raw.
2001-07-10 23:24:48 +02:00
|
|
|
|
read_memory (addr, VALUE_CONTENTS_ALL_RAW (val), TYPE_LENGTH (type));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
VALUE_LVAL (val) = lval_memory;
|
|
|
|
|
VALUE_ADDRESS (val) = addr;
|
|
|
|
|
VALUE_BFD_SECTION (val) = sect;
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a lazy value with type TYPE located at ADDR (cf. value_at). */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_at_lazy (struct type *type, CORE_ADDR addr, asection *sect)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
|
|
|
|
|
error ("Attempt to dereference a generic pointer.");
|
|
|
|
|
|
|
|
|
|
val = allocate_value (type);
|
|
|
|
|
|
|
|
|
|
VALUE_LVAL (val) = lval_memory;
|
|
|
|
|
VALUE_ADDRESS (val) = addr;
|
|
|
|
|
VALUE_LAZY (val) = 1;
|
|
|
|
|
VALUE_BFD_SECTION (val) = sect;
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-04 06:53:50 +02:00
|
|
|
|
/* Called only from the VALUE_CONTENTS and VALUE_CONTENTS_ALL macros,
|
|
|
|
|
if the current data for a variable needs to be loaded into
|
|
|
|
|
VALUE_CONTENTS(VAL). Fetches the data from the user's process, and
|
1999-04-16 03:35:26 +02:00
|
|
|
|
clears the lazy flag to indicate that the data in the buffer is valid.
|
|
|
|
|
|
|
|
|
|
If the value is zero-length, we avoid calling read_memory, which would
|
|
|
|
|
abort. We mark the value as fetched anyway -- all 0 bytes of it.
|
|
|
|
|
|
|
|
|
|
This function returns a value because it is used in the VALUE_CONTENTS
|
|
|
|
|
macro as part of an expression, where a void would not work. The
|
|
|
|
|
value is ignored. */
|
|
|
|
|
|
|
|
|
|
int
|
2002-01-04 06:20:09 +01:00
|
|
|
|
value_fetch_lazy (struct value *val)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
CORE_ADDR addr = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
|
|
|
|
|
int length = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (val));
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *type = VALUE_TYPE (val);
|
Clean up the D10V port so that GDB and the target program no
longer disagree on how big pointers are.
* findvar.c (value_from_register): Remove special case code for D10V.
* printcmd.c (print_frame_args): Same.
* valops.c (value_at, value_fetch_lazy): Same.
* values.c (unpack_long): Same.
* gdbarch.sh: Changes to effect the following:
* gdbarch.h (GDB_TARGET_IS_D10V, D10V_MAKE_DADDR,
gdbarch_d10v_make_daddr_ftype, gdbarch_d10v_make_daddr,
set_gdbarch_d10v_make_daddr, D10V_MAKE_IADDR,
gdbarch_d10v_make_iaddr_ftype, gdbarch_d10v_make_iaddr,
set_gdbarch_d10v_make_iaddr, D10V_DADDR_P,
gdbarch_d10v_daddr_p_ftype, gdbarch_d10v_daddr_p,
set_gdbarch_d10v_daddr_p, D10V_IADDR_P,
gdbarch_d10v_iaddr_p_ftype, gdbarch_d10v_iaddr_p,
set_gdbarch_d10v_iaddr_p, D10V_CONVERT_DADDR_TO_RAW,
gdbarch_d10v_convert_daddr_to_raw_ftype,
gdbarch_d10v_convert_daddr_to_raw,
set_gdbarch_d10v_convert_daddr_to_raw, D10V_CONVERT_IADDR_TO_RAW,
gdbarch_d10v_convert_iaddr_to_raw_ftype,
gdbarch_d10v_convert_iaddr_to_raw,
set_gdbarch_d10v_convert_iaddr_to_raw): Delete declarations.
* gdbarch.c: Delete the corresponding definitions.
(struct gdbarch): Delete members d10v_make_daddr,
d10v_make_iaddr, d10v_daddr_p, d10v_iaddr_p,
d10v_convert_daddr_to_raw, and d10v_convert_iaddr_to_raw.
(startup_gdbarch): Remove initializers for the above.
(verify_gdbarch, gdbarch_dump): Don't verify or dump them any
more.
* d10v-tdep.c (d10v_register_virtual_type): Rather that
claiming the stack pointer and PC are 32 bits long (which they
aren't), say that the stack pointer is an int16_t, and the
program counter is a function pointer. This allows the rest
of GDB to make the appropriate conversions between the code
pointer format and real addresses.
(d10v_register_convertible, d10v_register_convert_to_virtual,
d10v_register_convert_to_raw): Delete function; no registers
are convertible now, so we use
generic_register_convertible_not instead.
(d10v_address_to_pointer, d10v_pointer_to_address): New gdbarch
methods.
(d10v_push_arguments, d10v_extract_return_value): Remove special
cases for code and data pointers.
(d10v_gdbarch_init): Set gdbarch_ptr_bit to 16, so that GDB and
the target agree on how large pointers are. Say that addresses
are 32 bits long. Register the address_to_pointer and
pointer_to_address conversion functions. Since no registers are
convertible now, register generic_register_convertible_not as the
gdbarch_register_convertible method instead of
d10v_register_convertible. Remove registrations for
d10v_register_convert_to_virtual,
d10v_register_convert_to_raw, gdbarch_d10v_make_daddr,
gdbarch_d10v_make_iaddr, gdbarch_d10v_daddr_p,
gdbarch_d10v_iaddr_p, gdbarch_d10v_convert_daddr_to_raw, and
gdbarch_d10v_convert_iaddr_to_raw.
2001-07-10 23:24:48 +02:00
|
|
|
|
if (length)
|
2000-05-20 12:29:51 +02:00
|
|
|
|
read_memory (addr, VALUE_CONTENTS_ALL_RAW (val), length);
|
2000-07-15 19:40:30 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_LAZY (val) = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Store the contents of FROMVAL into the location of TOVAL.
|
|
|
|
|
Return a new value with the location of TOVAL and contents of FROMVAL. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_assign (struct value *toval, struct value *fromval)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct type *type;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
2003-05-08 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh: Delete references to MAX_REGISTER_RAW_SIZE.
* gdbarch.h: Re-generate.
* defs.h (MAX_REGISTER_RAW_SIZE): Delete macro.
(legacy_max_register_raw_size): Delete declaration.
* regcache.c (legacy_max_register_raw_size): Delete function.
* valops.c: Replace MAX_REGISTER_RAW_SIZE with MAX_REGISTER_SIZE.
* target.c, stack.c, sparc-tdep.c, sh-tdep.c: Update.
* rs6000-tdep.c, rs6000-nat.c, remote.c, remote-sim.c: Update.
* remote-rdp.c, remote-array.c, regcache.c: Update.
* ppc-linux-nat.c, monitor.c, mn10300-tdep.c: Update.
* mips-tdep.c, mips-linux-tdep.c, m68klinux-nat.c: Update.
* infptrace.c, ia64-tdep.c, i386-tdep.c, frame.c: Update.
* findvar.c, dwarf2cfi.c: Update.
Index: tui/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* tuiRegs.c: Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
Index: mi/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* mi-main.c (register_changed_p): Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
2003-05-08 22:52:49 +02:00
|
|
|
|
char raw_buffer[MAX_REGISTER_SIZE];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int use_buffer = 0;
|
2003-01-30 17:44:20 +01:00
|
|
|
|
struct frame_id old_frame;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!toval->modifiable)
|
|
|
|
|
error ("Left operand of assignment is not a modifiable lvalue.");
|
|
|
|
|
|
|
|
|
|
COERCE_REF (toval);
|
|
|
|
|
|
|
|
|
|
type = VALUE_TYPE (toval);
|
|
|
|
|
if (VALUE_LVAL (toval) != lval_internalvar)
|
|
|
|
|
fromval = value_cast (type, fromval);
|
|
|
|
|
else
|
|
|
|
|
COERCE_ARRAY (fromval);
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
|
2003-01-30 17:44:20 +01:00
|
|
|
|
/* Since modifying a register can trash the frame chain, and modifying memory
|
|
|
|
|
can trash the frame cache, we save the old frame and then restore the new
|
|
|
|
|
frame afterwards. */
|
|
|
|
|
old_frame = get_frame_id (deprecated_selected_frame);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
switch (VALUE_LVAL (toval))
|
|
|
|
|
{
|
|
|
|
|
case lval_internalvar:
|
|
|
|
|
set_internalvar (VALUE_INTERNALVAR (toval), fromval);
|
|
|
|
|
val = value_copy (VALUE_INTERNALVAR (toval)->value);
|
2001-05-19 17:20:14 +02:00
|
|
|
|
val = value_change_enclosing_type (val, VALUE_ENCLOSING_TYPE (fromval));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_EMBEDDED_OFFSET (val) = VALUE_EMBEDDED_OFFSET (fromval);
|
|
|
|
|
VALUE_POINTED_TO_OFFSET (val) = VALUE_POINTED_TO_OFFSET (fromval);
|
|
|
|
|
return val;
|
|
|
|
|
|
|
|
|
|
case lval_internalvar_component:
|
|
|
|
|
set_internalvar_component (VALUE_INTERNALVAR (toval),
|
|
|
|
|
VALUE_OFFSET (toval),
|
|
|
|
|
VALUE_BITPOS (toval),
|
|
|
|
|
VALUE_BITSIZE (toval),
|
|
|
|
|
fromval);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case lval_memory:
|
|
|
|
|
{
|
|
|
|
|
char *dest_buffer;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
CORE_ADDR changed_addr;
|
|
|
|
|
int changed_len;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (VALUE_BITSIZE (toval))
|
|
|
|
|
{
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char buffer[sizeof (LONGEST)];
|
|
|
|
|
/* We assume that the argument to read_memory is in units of
|
|
|
|
|
host chars. FIXME: Is that correct? */
|
|
|
|
|
changed_len = (VALUE_BITPOS (toval)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
+ VALUE_BITSIZE (toval)
|
|
|
|
|
+ HOST_CHAR_BIT - 1)
|
|
|
|
|
/ HOST_CHAR_BIT;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (changed_len > (int) sizeof (LONGEST))
|
|
|
|
|
error ("Can't handle bitfields which don't fit in a %d bit word.",
|
2002-04-23 05:00:57 +02:00
|
|
|
|
(int) sizeof (LONGEST) * HOST_CHAR_BIT);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
read_memory (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval),
|
|
|
|
|
buffer, changed_len);
|
|
|
|
|
modify_field (buffer, value_as_long (fromval),
|
|
|
|
|
VALUE_BITPOS (toval), VALUE_BITSIZE (toval));
|
|
|
|
|
changed_addr = VALUE_ADDRESS (toval) + VALUE_OFFSET (toval);
|
|
|
|
|
dest_buffer = buffer;
|
|
|
|
|
}
|
|
|
|
|
else if (use_buffer)
|
|
|
|
|
{
|
|
|
|
|
changed_addr = VALUE_ADDRESS (toval) + VALUE_OFFSET (toval);
|
|
|
|
|
changed_len = use_buffer;
|
|
|
|
|
dest_buffer = raw_buffer;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
changed_addr = VALUE_ADDRESS (toval) + VALUE_OFFSET (toval);
|
|
|
|
|
changed_len = TYPE_LENGTH (type);
|
|
|
|
|
dest_buffer = VALUE_CONTENTS (fromval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
write_memory (changed_addr, dest_buffer, changed_len);
|
|
|
|
|
if (memory_changed_hook)
|
|
|
|
|
memory_changed_hook (changed_addr, changed_len);
|
2002-08-21 17:34:36 +02:00
|
|
|
|
target_changed_event ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case lval_reg_frame_relative:
|
2002-11-07 03:45:27 +01:00
|
|
|
|
case lval_register:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct frame_info *frame;
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
int value_reg;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Figure out which frame this is in currently. */
|
2002-11-07 03:45:27 +01:00
|
|
|
|
if (VALUE_LVAL (toval) == lval_register)
|
|
|
|
|
{
|
|
|
|
|
frame = get_current_frame ();
|
|
|
|
|
value_reg = VALUE_REGNO (toval);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-06-05 22:59:16 +02:00
|
|
|
|
frame = frame_find_by_id (VALUE_FRAME_ID (toval));
|
2002-11-07 03:45:27 +01:00
|
|
|
|
value_reg = VALUE_FRAME_REGNUM (toval);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!frame)
|
|
|
|
|
error ("Value being assigned to is no longer active.");
|
2002-11-07 03:45:27 +01:00
|
|
|
|
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
if (VALUE_LVAL (toval) == lval_reg_frame_relative
|
|
|
|
|
&& CONVERT_REGISTER_P (VALUE_FRAME_REGNUM (toval), type))
|
2002-11-07 03:45:27 +01:00
|
|
|
|
{
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
/* If TOVAL is a special machine register requiring
|
|
|
|
|
conversion of program values to a special raw format. */
|
|
|
|
|
VALUE_TO_REGISTER (frame, VALUE_FRAME_REGNUM (toval),
|
|
|
|
|
type, VALUE_CONTENTS (fromval));
|
2002-11-07 03:45:27 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2002-11-07 03:45:27 +01:00
|
|
|
|
{
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
/* TOVAL is stored in a series of registers in the frame
|
|
|
|
|
specified by the structure. Copy that value out,
|
|
|
|
|
modify it, and copy it back in. */
|
|
|
|
|
int amount_copied;
|
|
|
|
|
int amount_to_copy;
|
|
|
|
|
char *buffer;
|
|
|
|
|
int reg_offset;
|
|
|
|
|
int byte_offset;
|
|
|
|
|
int regno;
|
|
|
|
|
|
|
|
|
|
/* Locate the first register that falls in the value that
|
|
|
|
|
needs to be transfered. Compute the offset of the
|
|
|
|
|
value in that register. */
|
|
|
|
|
{
|
|
|
|
|
int offset;
|
|
|
|
|
for (reg_offset = value_reg, offset = 0;
|
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_RAW_SIZE): Rename
REGISTER_RAW_SIZE.
* gdbarch.h, gdbarch.c: Re-generate.
* aix-thread.c, alpha-tdep.h, arm-tdep.c, core-sol2.c: Update.
* cris-tdep.c, dve3900-rom.c, findvar.c, frame.c: Update.
* hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update.
* hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update.
* ia64-linux-nat.c, ia64-tdep.c, infcmd.c, infptrace.c: Update.
* infrun.c, irix5-nat.c, lynx-nat.c, mips-linux-tdep.c: Update.
* mips-nat.c, mips-tdep.c, mipsv4-nat.c, mn10300-tdep.c: Update.
* monitor.c, ns32k-tdep.c, ppc-linux-nat.c, regcache.c: Update.
* remote-e7000.c, remote-mips.c, remote-sim.c: Update.
* remote-vxmips.c, remote-vxsparc.c, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, rs6000-tdep.c, s390-tdep.c: Update.
* sh64-tdep.c, sparc-nat.c, sparc-tdep.c, stack.c: Update.
* target.c, tracepoint.c, v850-tdep.c, v850ice.c, valops.c: Update.
* vax-tdep.c, vax-tdep.h, x86-64-tdep.c, xstormy16-tdep.c: Update.
* config/m68k/tm-delta68.h, config/m68k/tm-vx68.h: Update.
* config/sparc/tm-sparc.h, config/sparc/tm-sparclynx.h: Update.
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Rename
REGISTER_RAW_SIZE to DEPRECATED_REGISTER_RAW_SIZE.
* gdb.texinfo (Packets, Stop Reply Packets): Ditto.
* gdbint.texinfo (Target Architecture Definition): Rename
2003-10-02 Andrew Cagney <cagney@redhat.com>
* mi-main.c: Rename REGISTER_RAW_SIZE to
DEPRECATED_REGISTER_RAW_SIZE.
2003-10-02 22:28:31 +02:00
|
|
|
|
offset + DEPRECATED_REGISTER_RAW_SIZE (reg_offset) <= VALUE_OFFSET (toval);
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
reg_offset++);
|
|
|
|
|
byte_offset = VALUE_OFFSET (toval) - offset;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
/* Compute the number of register aligned values that need
|
|
|
|
|
to be copied. */
|
|
|
|
|
if (VALUE_BITSIZE (toval))
|
|
|
|
|
amount_to_copy = byte_offset + 1;
|
|
|
|
|
else
|
|
|
|
|
amount_to_copy = byte_offset + TYPE_LENGTH (type);
|
2002-11-07 03:45:27 +01:00
|
|
|
|
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
/* And a bounce buffer. Be slightly over generous. */
|
|
|
|
|
buffer = (char *) alloca (amount_to_copy + MAX_REGISTER_SIZE);
|
|
|
|
|
|
|
|
|
|
/* Copy it in. */
|
|
|
|
|
for (regno = reg_offset, amount_copied = 0;
|
|
|
|
|
amount_copied < amount_to_copy;
|
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_RAW_SIZE): Rename
REGISTER_RAW_SIZE.
* gdbarch.h, gdbarch.c: Re-generate.
* aix-thread.c, alpha-tdep.h, arm-tdep.c, core-sol2.c: Update.
* cris-tdep.c, dve3900-rom.c, findvar.c, frame.c: Update.
* hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update.
* hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update.
* ia64-linux-nat.c, ia64-tdep.c, infcmd.c, infptrace.c: Update.
* infrun.c, irix5-nat.c, lynx-nat.c, mips-linux-tdep.c: Update.
* mips-nat.c, mips-tdep.c, mipsv4-nat.c, mn10300-tdep.c: Update.
* monitor.c, ns32k-tdep.c, ppc-linux-nat.c, regcache.c: Update.
* remote-e7000.c, remote-mips.c, remote-sim.c: Update.
* remote-vxmips.c, remote-vxsparc.c, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, rs6000-tdep.c, s390-tdep.c: Update.
* sh64-tdep.c, sparc-nat.c, sparc-tdep.c, stack.c: Update.
* target.c, tracepoint.c, v850-tdep.c, v850ice.c, valops.c: Update.
* vax-tdep.c, vax-tdep.h, x86-64-tdep.c, xstormy16-tdep.c: Update.
* config/m68k/tm-delta68.h, config/m68k/tm-vx68.h: Update.
* config/sparc/tm-sparc.h, config/sparc/tm-sparclynx.h: Update.
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Rename
REGISTER_RAW_SIZE to DEPRECATED_REGISTER_RAW_SIZE.
* gdb.texinfo (Packets, Stop Reply Packets): Ditto.
* gdbint.texinfo (Target Architecture Definition): Rename
2003-10-02 Andrew Cagney <cagney@redhat.com>
* mi-main.c: Rename REGISTER_RAW_SIZE to
DEPRECATED_REGISTER_RAW_SIZE.
2003-10-02 22:28:31 +02:00
|
|
|
|
amount_copied += DEPRECATED_REGISTER_RAW_SIZE (regno), regno++)
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
frame_register_read (frame, regno, buffer + amount_copied);
|
2002-11-07 03:45:27 +01:00
|
|
|
|
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
/* Modify what needs to be modified. */
|
|
|
|
|
if (VALUE_BITSIZE (toval))
|
|
|
|
|
modify_field (buffer + byte_offset,
|
|
|
|
|
value_as_long (fromval),
|
|
|
|
|
VALUE_BITPOS (toval), VALUE_BITSIZE (toval));
|
|
|
|
|
else if (use_buffer)
|
|
|
|
|
memcpy (buffer + VALUE_OFFSET (toval), raw_buffer, use_buffer);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
memcpy (buffer + byte_offset, VALUE_CONTENTS (fromval),
|
|
|
|
|
TYPE_LENGTH (type));
|
|
|
|
|
|
|
|
|
|
/* Copy it out. */
|
|
|
|
|
for (regno = reg_offset, amount_copied = 0;
|
|
|
|
|
amount_copied < amount_to_copy;
|
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_RAW_SIZE): Rename
REGISTER_RAW_SIZE.
* gdbarch.h, gdbarch.c: Re-generate.
* aix-thread.c, alpha-tdep.h, arm-tdep.c, core-sol2.c: Update.
* cris-tdep.c, dve3900-rom.c, findvar.c, frame.c: Update.
* hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update.
* hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update.
* ia64-linux-nat.c, ia64-tdep.c, infcmd.c, infptrace.c: Update.
* infrun.c, irix5-nat.c, lynx-nat.c, mips-linux-tdep.c: Update.
* mips-nat.c, mips-tdep.c, mipsv4-nat.c, mn10300-tdep.c: Update.
* monitor.c, ns32k-tdep.c, ppc-linux-nat.c, regcache.c: Update.
* remote-e7000.c, remote-mips.c, remote-sim.c: Update.
* remote-vxmips.c, remote-vxsparc.c, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, rs6000-tdep.c, s390-tdep.c: Update.
* sh64-tdep.c, sparc-nat.c, sparc-tdep.c, stack.c: Update.
* target.c, tracepoint.c, v850-tdep.c, v850ice.c, valops.c: Update.
* vax-tdep.c, vax-tdep.h, x86-64-tdep.c, xstormy16-tdep.c: Update.
* config/m68k/tm-delta68.h, config/m68k/tm-vx68.h: Update.
* config/sparc/tm-sparc.h, config/sparc/tm-sparclynx.h: Update.
2003-10-02 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Rename
REGISTER_RAW_SIZE to DEPRECATED_REGISTER_RAW_SIZE.
* gdb.texinfo (Packets, Stop Reply Packets): Ditto.
* gdbint.texinfo (Target Architecture Definition): Rename
2003-10-02 Andrew Cagney <cagney@redhat.com>
* mi-main.c: Rename REGISTER_RAW_SIZE to
DEPRECATED_REGISTER_RAW_SIZE.
2003-10-02 22:28:31 +02:00
|
|
|
|
amount_copied += DEPRECATED_REGISTER_RAW_SIZE (regno), regno++)
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
put_frame_register (frame, regno, buffer + amount_copied);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (register_changed_hook)
|
|
|
|
|
register_changed_hook (-1);
|
2002-08-21 17:34:36 +02:00
|
|
|
|
target_changed_event ();
|
2003-06-14 Andrew Cagney <cagney@redhat.com>
Mark Kettenis <kettenis@gnu.org>
* gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter.
(REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer
parameter with "frame".
* gdbarch.h, gdbarch.c: Re-generate.
* frame.h (put_frame_register): Declare.
* frame.c (put_frame_register): New function.
* arch-utils.c (legacy_convert_register_p): Add "type" parameter.
(legacy_register_to_value): Rewrite, use "frame" to get the
register value.
(legacy_value_to_register): Rewrite, use "frame" to find the
register's location before storing.
* arch-utils.h (legacy_convert_register_p): Update.
(legacy_register_to_value, legacy_value_to_register): Update.
* findvar.c (value_from_register): Rewrite, eliminate use of
REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass
"frame" to REGISTER_TO_VALUE.
* valops.c (value_assign): Move the CONVERT_REGISTER code to the
lval_reg_frame_relative + lval_register branch of the switch. Do
not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register.
* i386-tdep.c (I386_EBX_REGNUM, I386_ECX_REGNUM, I386_ESI_REGNUM,
I386_EDI_REGNUM): New defines.
(i386_next_regnum, i386_convert_register_p,
i386_register_to_value, i386_value_to_register): New functions.
(i386_register_convertible, i386_register_convert_to_virtual,
i386_convert_to_raw): Remove functions.
(i386_gdbarch_init): Set convert_register_p, register_to_value and
value_to_register instead of register_convertible,
register_convert_to_virtual and register_convert_to_raw.
* mips-tdep.c (mips_convert_register_p): New function.
(mips_value_to_register): Replace mips_register_convert_from_type.
(mips_register_to_value): Replace mips_register_convert_to_type.
(mips_gdbarch_init): Set conver_register_p, value_to_register and
register_to_value.
* alpha-tdep.c (alpha_convert_register_p): Update.
(alpha_value_to_register): Update, store the register.
(alpha_register_to_value): Update, fetch the register.
2003-06-15 00:35:25 +02:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-11-07 03:45:27 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
error ("Left operand of assignment is not an lvalue.");
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-30 17:44:20 +01:00
|
|
|
|
/* Assigning to the stack pointer, frame pointer, and other
|
|
|
|
|
(architecture and calling convention specific) registers may
|
|
|
|
|
cause the frame cache to be out of date. Assigning to memory
|
|
|
|
|
also can. We just do this on all assignments to registers or
|
|
|
|
|
memory, for simplicity's sake; I doubt the slowdown matters. */
|
|
|
|
|
switch (VALUE_LVAL (toval))
|
|
|
|
|
{
|
|
|
|
|
case lval_memory:
|
|
|
|
|
case lval_register:
|
|
|
|
|
case lval_reg_frame_relative:
|
|
|
|
|
|
|
|
|
|
reinit_frame_cache ();
|
|
|
|
|
|
|
|
|
|
/* Having destoroyed the frame cache, restore the selected frame. */
|
|
|
|
|
|
|
|
|
|
/* FIXME: cagney/2002-11-02: There has to be a better way of
|
|
|
|
|
doing this. Instead of constantly saving/restoring the
|
|
|
|
|
frame. Why not create a get_selected_frame() function that,
|
|
|
|
|
having saved the selected frame's ID can automatically
|
|
|
|
|
re-find the previously selected frame automatically. */
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi = frame_find_by_id (old_frame);
|
|
|
|
|
if (fi != NULL)
|
|
|
|
|
select_frame (fi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* If the field does not entirely fill a LONGEST, then zero the sign bits.
|
|
|
|
|
If the field is signed, and is negative, then sign extend. */
|
|
|
|
|
if ((VALUE_BITSIZE (toval) > 0)
|
|
|
|
|
&& (VALUE_BITSIZE (toval) < 8 * (int) sizeof (LONGEST)))
|
|
|
|
|
{
|
|
|
|
|
LONGEST fieldval = value_as_long (fromval);
|
|
|
|
|
LONGEST valmask = (((ULONGEST) 1) << VALUE_BITSIZE (toval)) - 1;
|
|
|
|
|
|
|
|
|
|
fieldval &= valmask;
|
|
|
|
|
if (!TYPE_UNSIGNED (type) && (fieldval & (valmask ^ (valmask >> 1))))
|
|
|
|
|
fieldval |= ~valmask;
|
|
|
|
|
|
|
|
|
|
fromval = value_from_longest (type, fieldval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = value_copy (toval);
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (val), VALUE_CONTENTS (fromval),
|
|
|
|
|
TYPE_LENGTH (type));
|
|
|
|
|
VALUE_TYPE (val) = type;
|
2001-05-19 17:20:14 +02:00
|
|
|
|
val = value_change_enclosing_type (val, VALUE_ENCLOSING_TYPE (fromval));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_EMBEDDED_OFFSET (val) = VALUE_EMBEDDED_OFFSET (fromval);
|
|
|
|
|
VALUE_POINTED_TO_OFFSET (val) = VALUE_POINTED_TO_OFFSET (fromval);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extend a value VAL to COUNT repetitions of its type. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_repeat (struct value *arg1, int count)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (VALUE_LVAL (arg1) != lval_memory)
|
|
|
|
|
error ("Only values in memory can be extended with '@'.");
|
|
|
|
|
if (count < 1)
|
|
|
|
|
error ("Invalid number %d of repetitions.", count);
|
|
|
|
|
|
|
|
|
|
val = allocate_repeat_value (VALUE_ENCLOSING_TYPE (arg1), count);
|
|
|
|
|
|
|
|
|
|
read_memory (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1),
|
|
|
|
|
VALUE_CONTENTS_ALL_RAW (val),
|
|
|
|
|
TYPE_LENGTH (VALUE_ENCLOSING_TYPE (val)));
|
|
|
|
|
VALUE_LVAL (val) = lval_memory;
|
|
|
|
|
VALUE_ADDRESS (val) = VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1);
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_of_variable (struct symbol *var, struct block *b)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct frame_info *frame = NULL;
|
|
|
|
|
|
|
|
|
|
if (!b)
|
|
|
|
|
frame = NULL; /* Use selected frame. */
|
|
|
|
|
else if (symbol_read_needs_frame (var))
|
|
|
|
|
{
|
|
|
|
|
frame = block_innermost_frame (b);
|
|
|
|
|
if (!frame)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (BLOCK_FUNCTION (b)
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
&& SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No frame is currently executing in block %s.",
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
|
|
|
|
error ("No frame is currently executing in specified block");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = read_var_value (var, frame);
|
|
|
|
|
if (!val)
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
error ("Address of symbol \"%s\" is unknown.", SYMBOL_PRINT_NAME (var));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a value which is an array, return a value which is a pointer to its
|
|
|
|
|
first element, regardless of whether or not the array has a nonzero lower
|
|
|
|
|
bound.
|
|
|
|
|
|
|
|
|
|
FIXME: A previous comment here indicated that this routine should be
|
|
|
|
|
substracting the array's lower bound. It's not clear to me that this
|
|
|
|
|
is correct. Given an array subscripting operation, it would certainly
|
|
|
|
|
work to do the adjustment here, essentially computing:
|
|
|
|
|
|
|
|
|
|
(&array[0] - (lowerbound * sizeof array[0])) + (index * sizeof array[0])
|
|
|
|
|
|
|
|
|
|
However I believe a more appropriate and logical place to account for
|
|
|
|
|
the lower bound is to do so in value_subscript, essentially computing:
|
|
|
|
|
|
|
|
|
|
(&array[0] + ((index - lowerbound) * sizeof array[0]))
|
|
|
|
|
|
|
|
|
|
As further evidence consider what would happen with operations other
|
|
|
|
|
than array subscripting, where the caller would get back a value that
|
|
|
|
|
had an address somewhere before the actual first element of the array,
|
|
|
|
|
and the information about the lower bound would be lost because of
|
|
|
|
|
the coercion to pointer type.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_coerce_array (struct value *arg1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct type *type = check_typedef (VALUE_TYPE (arg1));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (VALUE_LVAL (arg1) != lval_memory)
|
|
|
|
|
error ("Attempt to take address of value not located in memory.");
|
|
|
|
|
|
* gdbarch.sh (POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Two new
functions which architectures can redefine, defaulting to
generic_pointer_to_address and generic_address_to_pointer.
* findvar.c (extract_typed_address, store_typed_address,
generic_pointer_to_address, generic_address_to_pointer): New
functions.
(POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Provide default
definitions.
(extract_address, store_address): Doc fixes.
* values.c (value_as_pointer): Doc fix.
(value_from_pointer): New function.
* defs.h (extract_typed_address, store_typed_address): New
declarations.
* inferior.h (generic_address_to_pointer,
generic_pointer_to_address): New declarations.
* value.h (value_from_pointer): New declaration.
* ax-gdb.c (const_var_ref): Use value_from_pointer, not
value_from_longest.
* blockframe.c (generic_push_dummy_frame): Use read_pc and
read_sp, not read_register.
* c-valprint.c (c_val_print): Use extract_typed_address instead of
extract_address to extract vtable entries and references.
* cp-valprint.c (cp_print_value_fields): Use value_from_pointer
instead of value_from_longest to extract the vtable's address.
* eval.c (evaluate_subexp_standard): Use value_from_pointer
instead of value_from_longest to compute `this', and for doing
pointer-to-member dereferencing.
* findvar.c (read_register): Use extract_unsigned_integer, not
extract_address.
(read_var_value): Use store_typed_address instead of store_address
for building label values.
(locate_var_value): Use value_from_pointer instead of
value_from_longest.
* hppa-tdep.c (find_stub_with_shl_get): Use value_from_pointer,
instead of value_from_longest, to build arguments to __d_shl_get.
* printcmd.c (set_next_address): Use value_from_pointer, not
value_from_longest.
(x_command): Use value_from_pointer, not value_from_longest.
* tracepoint.c (set_traceframe_context): Use value_from_pointer,
not value_from_longest.
* valarith.c (value_add, value_sub): Use value_from_pointer, not
value_from_longest.
* valops.c (find_function_in_inferior, value_coerce_array,
value_coerce_function, value_addr, hand_function_call): Same.
* value.h (COERCE_REF): Use unpack_pointer, not unpack_long.
* values.c (unpack_long): Use extract_typed_address to produce
addresses from pointers and references, not extract_address.
(value_from_longest): Use store_typed_address instead of
store_address to produce pointer and reference values.
2000-04-14 20:43:41 +02:00
|
|
|
|
return value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
|
|
|
|
|
(VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a value which is a function, return a value which is a pointer
|
|
|
|
|
to it. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_coerce_function (struct value *arg1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *retval;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (VALUE_LVAL (arg1) != lval_memory)
|
|
|
|
|
error ("Attempt to take address of value not located in memory.");
|
|
|
|
|
|
* gdbarch.sh (POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Two new
functions which architectures can redefine, defaulting to
generic_pointer_to_address and generic_address_to_pointer.
* findvar.c (extract_typed_address, store_typed_address,
generic_pointer_to_address, generic_address_to_pointer): New
functions.
(POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Provide default
definitions.
(extract_address, store_address): Doc fixes.
* values.c (value_as_pointer): Doc fix.
(value_from_pointer): New function.
* defs.h (extract_typed_address, store_typed_address): New
declarations.
* inferior.h (generic_address_to_pointer,
generic_pointer_to_address): New declarations.
* value.h (value_from_pointer): New declaration.
* ax-gdb.c (const_var_ref): Use value_from_pointer, not
value_from_longest.
* blockframe.c (generic_push_dummy_frame): Use read_pc and
read_sp, not read_register.
* c-valprint.c (c_val_print): Use extract_typed_address instead of
extract_address to extract vtable entries and references.
* cp-valprint.c (cp_print_value_fields): Use value_from_pointer
instead of value_from_longest to extract the vtable's address.
* eval.c (evaluate_subexp_standard): Use value_from_pointer
instead of value_from_longest to compute `this', and for doing
pointer-to-member dereferencing.
* findvar.c (read_register): Use extract_unsigned_integer, not
extract_address.
(read_var_value): Use store_typed_address instead of store_address
for building label values.
(locate_var_value): Use value_from_pointer instead of
value_from_longest.
* hppa-tdep.c (find_stub_with_shl_get): Use value_from_pointer,
instead of value_from_longest, to build arguments to __d_shl_get.
* printcmd.c (set_next_address): Use value_from_pointer, not
value_from_longest.
(x_command): Use value_from_pointer, not value_from_longest.
* tracepoint.c (set_traceframe_context): Use value_from_pointer,
not value_from_longest.
* valarith.c (value_add, value_sub): Use value_from_pointer, not
value_from_longest.
* valops.c (find_function_in_inferior, value_coerce_array,
value_coerce_function, value_addr, hand_function_call): Same.
* value.h (COERCE_REF): Use unpack_pointer, not unpack_long.
* values.c (unpack_long): Use extract_typed_address to produce
addresses from pointers and references, not extract_address.
(value_from_longest): Use store_typed_address instead of
store_address to produce pointer and reference values.
2000-04-14 20:43:41 +02:00
|
|
|
|
retval = value_from_pointer (lookup_pointer_type (VALUE_TYPE (arg1)),
|
|
|
|
|
(VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (arg1);
|
|
|
|
|
return retval;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Return a pointer value for the object for which ARG1 is the contents. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_addr (struct value *arg1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *arg2;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct type *type = check_typedef (VALUE_TYPE (arg1));
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
/* Copy the value, but change the type from (T&) to (T*).
|
2000-03-13 08:30:00 +01:00
|
|
|
|
We keep the same location information, which is efficient,
|
|
|
|
|
and allows &(&X) to get the location containing the reference. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
arg2 = value_copy (arg1);
|
|
|
|
|
VALUE_TYPE (arg2) = lookup_pointer_type (TYPE_TARGET_TYPE (type));
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_FUNC)
|
|
|
|
|
return value_coerce_function (arg1);
|
|
|
|
|
|
|
|
|
|
if (VALUE_LVAL (arg1) != lval_memory)
|
|
|
|
|
error ("Attempt to take address of value not located in memory.");
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Get target memory address */
|
* gdbarch.sh (POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Two new
functions which architectures can redefine, defaulting to
generic_pointer_to_address and generic_address_to_pointer.
* findvar.c (extract_typed_address, store_typed_address,
generic_pointer_to_address, generic_address_to_pointer): New
functions.
(POINTER_TO_ADDRESS, ADDRESS_TO_POINTER): Provide default
definitions.
(extract_address, store_address): Doc fixes.
* values.c (value_as_pointer): Doc fix.
(value_from_pointer): New function.
* defs.h (extract_typed_address, store_typed_address): New
declarations.
* inferior.h (generic_address_to_pointer,
generic_pointer_to_address): New declarations.
* value.h (value_from_pointer): New declaration.
* ax-gdb.c (const_var_ref): Use value_from_pointer, not
value_from_longest.
* blockframe.c (generic_push_dummy_frame): Use read_pc and
read_sp, not read_register.
* c-valprint.c (c_val_print): Use extract_typed_address instead of
extract_address to extract vtable entries and references.
* cp-valprint.c (cp_print_value_fields): Use value_from_pointer
instead of value_from_longest to extract the vtable's address.
* eval.c (evaluate_subexp_standard): Use value_from_pointer
instead of value_from_longest to compute `this', and for doing
pointer-to-member dereferencing.
* findvar.c (read_register): Use extract_unsigned_integer, not
extract_address.
(read_var_value): Use store_typed_address instead of store_address
for building label values.
(locate_var_value): Use value_from_pointer instead of
value_from_longest.
* hppa-tdep.c (find_stub_with_shl_get): Use value_from_pointer,
instead of value_from_longest, to build arguments to __d_shl_get.
* printcmd.c (set_next_address): Use value_from_pointer, not
value_from_longest.
(x_command): Use value_from_pointer, not value_from_longest.
* tracepoint.c (set_traceframe_context): Use value_from_pointer,
not value_from_longest.
* valarith.c (value_add, value_sub): Use value_from_pointer, not
value_from_longest.
* valops.c (find_function_in_inferior, value_coerce_array,
value_coerce_function, value_addr, hand_function_call): Same.
* value.h (COERCE_REF): Use unpack_pointer, not unpack_long.
* values.c (unpack_long): Use extract_typed_address to produce
addresses from pointers and references, not extract_address.
(value_from_longest): Use store_typed_address instead of
store_address to produce pointer and reference values.
2000-04-14 20:43:41 +02:00
|
|
|
|
arg2 = value_from_pointer (lookup_pointer_type (VALUE_TYPE (arg1)),
|
|
|
|
|
(VALUE_ADDRESS (arg1)
|
|
|
|
|
+ VALUE_OFFSET (arg1)
|
|
|
|
|
+ VALUE_EMBEDDED_OFFSET (arg1)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* This may be a pointer to a base subobject; so remember the
|
1999-07-07 22:19:36 +02:00
|
|
|
|
full derived object's type ... */
|
2001-05-19 17:20:14 +02:00
|
|
|
|
arg2 = value_change_enclosing_type (arg2, lookup_pointer_type (VALUE_ENCLOSING_TYPE (arg1)));
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* ... and also the relative position of the subobject in the full object */
|
|
|
|
|
VALUE_POINTED_TO_OFFSET (arg2) = VALUE_EMBEDDED_OFFSET (arg1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_BFD_SECTION (arg2) = VALUE_BFD_SECTION (arg1);
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a value of a pointer type, apply the C unary * operator to it. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_ind (struct value *arg1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *base_type;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *arg2;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
COERCE_ARRAY (arg1);
|
|
|
|
|
|
|
|
|
|
base_type = check_typedef (VALUE_TYPE (arg1));
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (base_type) == TYPE_CODE_MEMBER)
|
|
|
|
|
error ("not implemented: member types in value_ind");
|
|
|
|
|
|
|
|
|
|
/* Allow * on an integer so we can cast it to whatever we want.
|
|
|
|
|
This returns an int, which seems like the most C-like thing
|
|
|
|
|
to do. "long long" variables are rare enough that
|
|
|
|
|
BUILTIN_TYPE_LONGEST would seem to be a mistake. */
|
|
|
|
|
if (TYPE_CODE (base_type) == TYPE_CODE_INT)
|
2002-06-19 01:41:02 +02:00
|
|
|
|
return value_at_lazy (builtin_type_int,
|
|
|
|
|
(CORE_ADDR) value_as_long (arg1),
|
|
|
|
|
VALUE_BFD_SECTION (arg1));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else if (TYPE_CODE (base_type) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
struct type *enc_type;
|
|
|
|
|
/* We may be pointing to something embedded in a larger object */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Get the real type of the enclosing object */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
enc_type = check_typedef (VALUE_ENCLOSING_TYPE (arg1));
|
|
|
|
|
enc_type = TYPE_TARGET_TYPE (enc_type);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Retrieve the enclosing object pointed to */
|
|
|
|
|
arg2 = value_at_lazy (enc_type,
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
|
value_as_address (arg1) - VALUE_POINTED_TO_OFFSET (arg1),
|
1999-07-07 22:19:36 +02:00
|
|
|
|
VALUE_BFD_SECTION (arg1));
|
|
|
|
|
/* Re-adjust type */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_TYPE (arg2) = TYPE_TARGET_TYPE (base_type);
|
|
|
|
|
/* Add embedding info */
|
2001-05-19 17:20:14 +02:00
|
|
|
|
arg2 = value_change_enclosing_type (arg2, enc_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_EMBEDDED_OFFSET (arg2) = VALUE_POINTED_TO_OFFSET (arg1);
|
|
|
|
|
|
|
|
|
|
/* We may be pointing to an object of some derived type */
|
|
|
|
|
arg2 = value_full_object (arg2, NULL, 0, 0, 0);
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error ("Attempt to take contents of a non-pointer value.");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return 0; /* For lint -- never reached */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pushing small parts of stack frames. */
|
|
|
|
|
|
|
|
|
|
/* Push one word (the size of object that a register holds). */
|
|
|
|
|
|
|
|
|
|
CORE_ADDR
|
2000-07-30 03:48:28 +02:00
|
|
|
|
push_word (CORE_ADDR sp, ULONGEST word)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int len = DEPRECATED_REGISTER_SIZE;
|
2003-05-09 00:03:35 +02:00
|
|
|
|
char buffer[MAX_REGISTER_SIZE];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
store_unsigned_integer (buffer, len, word);
|
|
|
|
|
if (INNER_THAN (1, 2))
|
|
|
|
|
{
|
|
|
|
|
/* stack grows downward */
|
|
|
|
|
sp -= len;
|
|
|
|
|
write_memory (sp, buffer, len);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* stack grows upward */
|
|
|
|
|
write_memory (sp, buffer, len);
|
|
|
|
|
sp += len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Push LEN bytes with data at BUFFER. */
|
|
|
|
|
|
|
|
|
|
CORE_ADDR
|
2000-07-30 03:48:28 +02:00
|
|
|
|
push_bytes (CORE_ADDR sp, char *buffer, int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (INNER_THAN (1, 2))
|
|
|
|
|
{
|
|
|
|
|
/* stack grows downward */
|
|
|
|
|
sp -= len;
|
|
|
|
|
write_memory (sp, buffer, len);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* stack grows upward */
|
|
|
|
|
write_memory (sp, buffer, len);
|
|
|
|
|
sp += len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sp;
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
#ifndef PARM_BOUNDARY
|
|
|
|
|
#define PARM_BOUNDARY (0)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Push onto the stack the specified value VALUE. Pad it correctly for
|
|
|
|
|
it to be an argument to a function. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
value_push (CORE_ADDR sp, struct value *arg)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int len = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (arg));
|
|
|
|
|
int container_len = len;
|
|
|
|
|
int offset;
|
1999-10-12 06:37:53 +02:00
|
|
|
|
|
|
|
|
|
/* How big is the container we're going to put this value in? */
|
|
|
|
|
if (PARM_BOUNDARY)
|
|
|
|
|
container_len = ((len + PARM_BOUNDARY / TARGET_CHAR_BIT - 1)
|
|
|
|
|
& ~(PARM_BOUNDARY / TARGET_CHAR_BIT - 1));
|
|
|
|
|
|
|
|
|
|
/* Are we going to put it at the high or low end of the container? */
|
2002-01-05 05:30:46 +01:00
|
|
|
|
if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
|
1999-10-12 06:37:53 +02:00
|
|
|
|
offset = container_len - len;
|
|
|
|
|
else
|
|
|
|
|
offset = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (INNER_THAN (1, 2))
|
|
|
|
|
{
|
|
|
|
|
/* stack grows downward */
|
1999-10-12 06:37:53 +02:00
|
|
|
|
sp -= container_len;
|
|
|
|
|
write_memory (sp + offset, VALUE_CONTENTS_ALL (arg), len);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* stack grows upward */
|
1999-10-12 06:37:53 +02:00
|
|
|
|
write_memory (sp + offset, VALUE_CONTENTS_ALL (arg), len);
|
|
|
|
|
sp += container_len;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sp;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-25 20:09:09 +02:00
|
|
|
|
CORE_ADDR
|
2003-03-26 23:39:53 +01:00
|
|
|
|
legacy_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
|
|
|
|
|
int struct_return, CORE_ADDR struct_addr)
|
1999-05-25 20:09:09 +02:00
|
|
|
|
{
|
|
|
|
|
/* ASSERT ( !struct_return); */
|
|
|
|
|
int i;
|
|
|
|
|
for (i = nargs - 1; i >= 0; i--)
|
|
|
|
|
sp = value_push (sp, args[i]);
|
|
|
|
|
return sp;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Create a value for an array by allocating space in the inferior, copying
|
|
|
|
|
the data into that space, and then setting up an array value.
|
|
|
|
|
|
|
|
|
|
The array bounds are set from LOWBOUND and HIGHBOUND, and the array is
|
|
|
|
|
populated from the values passed in ELEMVEC.
|
|
|
|
|
|
|
|
|
|
The element type of the array is inherited from the type of the
|
|
|
|
|
first element, and all elements must have the same size (though we
|
|
|
|
|
don't currently enforce any restriction on their types). */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_array (int lowbound, int highbound, struct value **elemvec)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int nelem;
|
|
|
|
|
int idx;
|
|
|
|
|
unsigned int typelength;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *rangetype;
|
|
|
|
|
struct type *arraytype;
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
|
|
|
|
/* Validate that the bounds are reasonable and that each of the elements
|
|
|
|
|
have the same size. */
|
|
|
|
|
|
|
|
|
|
nelem = highbound - lowbound + 1;
|
|
|
|
|
if (nelem <= 0)
|
|
|
|
|
{
|
|
|
|
|
error ("bad array bounds (%d, %d)", lowbound, highbound);
|
|
|
|
|
}
|
|
|
|
|
typelength = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (elemvec[0]));
|
|
|
|
|
for (idx = 1; idx < nelem; idx++)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_LENGTH (VALUE_ENCLOSING_TYPE (elemvec[idx])) != typelength)
|
|
|
|
|
{
|
|
|
|
|
error ("array elements must all be the same size");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rangetype = create_range_type ((struct type *) NULL, builtin_type_int,
|
|
|
|
|
lowbound, highbound);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
arraytype = create_array_type ((struct type *) NULL,
|
|
|
|
|
VALUE_ENCLOSING_TYPE (elemvec[0]), rangetype);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!current_language->c_style_arrays)
|
|
|
|
|
{
|
|
|
|
|
val = allocate_value (arraytype);
|
|
|
|
|
for (idx = 0; idx < nelem; idx++)
|
|
|
|
|
{
|
|
|
|
|
memcpy (VALUE_CONTENTS_ALL_RAW (val) + (idx * typelength),
|
|
|
|
|
VALUE_CONTENTS_ALL (elemvec[idx]),
|
|
|
|
|
typelength);
|
|
|
|
|
}
|
|
|
|
|
VALUE_BFD_SECTION (val) = VALUE_BFD_SECTION (elemvec[0]);
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate space to store the array in the inferior, and then initialize
|
|
|
|
|
it by copying in each element. FIXME: Is it worth it to create a
|
|
|
|
|
local buffer in which to collect each value and then write all the
|
|
|
|
|
bytes in one operation? */
|
|
|
|
|
|
|
|
|
|
addr = allocate_space_in_inferior (nelem * typelength);
|
|
|
|
|
for (idx = 0; idx < nelem; idx++)
|
|
|
|
|
{
|
|
|
|
|
write_memory (addr + (idx * typelength), VALUE_CONTENTS_ALL (elemvec[idx]),
|
|
|
|
|
typelength);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create the array type and set up an array value to be evaluated lazily. */
|
|
|
|
|
|
|
|
|
|
val = value_at_lazy (arraytype, addr, VALUE_BFD_SECTION (elemvec[0]));
|
|
|
|
|
return (val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a value for a string constant by allocating space in the inferior,
|
|
|
|
|
copying the data into that space, and returning the address with type
|
|
|
|
|
TYPE_CODE_STRING. PTR points to the string constant data; LEN is number
|
|
|
|
|
of characters.
|
|
|
|
|
Note that string types are like array of char types with a lower bound of
|
|
|
|
|
zero and an upper bound of LEN - 1. Also note that the string may contain
|
|
|
|
|
embedded null bytes. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_string (char *ptr, int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
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
|
1999-07-07 22:19:36 +02:00
|
|
|
|
= create_string_type ((struct type *) NULL, rangetype);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
|
|
|
|
if (current_language->c_style_arrays == 0)
|
|
|
|
|
{
|
|
|
|
|
val = allocate_value (stringtype);
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (val), ptr, len);
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Allocate space to store the string in the inferior, and then
|
|
|
|
|
copy LEN bytes from PTR in gdb to that address in the inferior. */
|
|
|
|
|
|
|
|
|
|
addr = allocate_space_in_inferior (len);
|
|
|
|
|
write_memory (addr, ptr, len);
|
|
|
|
|
|
|
|
|
|
val = value_at_lazy (stringtype, addr, NULL);
|
|
|
|
|
return (val);
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_bitstring (char *ptr, int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *domain_type = create_range_type (NULL, builtin_type_int,
|
|
|
|
|
0, len - 1);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *type = create_set_type ((struct type *) NULL, domain_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_BITSTRING;
|
|
|
|
|
val = allocate_value (type);
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (val), ptr, TYPE_LENGTH (type));
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See if we can pass arguments in T2 to a function which takes arguments
|
2002-06-14 16:34:26 +02:00
|
|
|
|
of types T1. T1 is a list of NARGS arguments, and T2 is a NULL-terminated
|
|
|
|
|
vector. If some arguments need coercion of some sort, then the coerced
|
|
|
|
|
values are written into T2. Return value is 0 if the arguments could be
|
|
|
|
|
matched, or the position at which they differ if not.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
STATICP is nonzero if the T1 argument list came from a
|
2002-06-14 16:34:26 +02:00
|
|
|
|
static member function. T2 will still include the ``this'' pointer,
|
|
|
|
|
but it will be skipped.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
For non-static member functions, we ignore the first argument,
|
|
|
|
|
which is the type of the instance variable. This is because we want
|
|
|
|
|
to handle calls with objects from derived classes. This is not
|
|
|
|
|
entirely correct: we should actually check to make sure that a
|
|
|
|
|
requested operation is type secure, shouldn't we? FIXME. */
|
|
|
|
|
|
|
|
|
|
static int
|
2002-06-14 16:34:26 +02:00
|
|
|
|
typecmp (int staticp, int varargs, int nargs,
|
|
|
|
|
struct field t1[], struct value *t2[])
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (t2 == 0)
|
2002-06-14 16:34:26 +02:00
|
|
|
|
internal_error (__FILE__, __LINE__, "typecmp: no argument list");
|
|
|
|
|
|
2002-05-12 04:20:38 +02:00
|
|
|
|
/* Skip ``this'' argument if applicable. T2 will always include THIS. */
|
|
|
|
|
if (staticp)
|
2002-06-14 16:34:26 +02:00
|
|
|
|
t2 ++;
|
|
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
|
(i < nargs) && TYPE_CODE (t1[i].type) != TYPE_CODE_VOID;
|
|
|
|
|
i++)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *tt1, *tt2;
|
2002-06-14 16:34:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!t2[i])
|
|
|
|
|
return i + 1;
|
2002-06-14 16:34:26 +02:00
|
|
|
|
|
|
|
|
|
tt1 = check_typedef (t1[i].type);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
tt2 = check_typedef (VALUE_TYPE (t2[i]));
|
2002-06-14 16:34:26 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_CODE (tt1) == TYPE_CODE_REF
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* We should be doing hairy argument matching, as below. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& (TYPE_CODE (check_typedef (TYPE_TARGET_TYPE (tt1))) == TYPE_CODE (tt2)))
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (tt2) == TYPE_CODE_ARRAY)
|
|
|
|
|
t2[i] = value_coerce_array (t2[i]);
|
|
|
|
|
else
|
|
|
|
|
t2[i] = value_addr (t2[i]);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2000-07-15 19:40:30 +02:00
|
|
|
|
/* djb - 20000715 - Until the new type structure is in the
|
|
|
|
|
place, and we can attempt things like implicit conversions,
|
|
|
|
|
we need to do this so you can take something like a map<const
|
|
|
|
|
char *>, and properly access map["hello"], because the
|
|
|
|
|
argument to [] will be a reference to a pointer to a char,
|
2000-07-17 21:41:10 +02:00
|
|
|
|
and the argument will be a pointer to a char. */
|
2000-07-15 19:40:30 +02:00
|
|
|
|
while ( TYPE_CODE(tt1) == TYPE_CODE_REF ||
|
|
|
|
|
TYPE_CODE (tt1) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
tt1 = check_typedef( TYPE_TARGET_TYPE(tt1) );
|
|
|
|
|
}
|
|
|
|
|
while ( TYPE_CODE(tt2) == TYPE_CODE_ARRAY ||
|
|
|
|
|
TYPE_CODE(tt2) == TYPE_CODE_PTR ||
|
|
|
|
|
TYPE_CODE(tt2) == TYPE_CODE_REF)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-07-15 19:40:30 +02:00
|
|
|
|
tt2 = check_typedef( TYPE_TARGET_TYPE(tt2) );
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_CODE (tt1) == TYPE_CODE (tt2))
|
|
|
|
|
continue;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Array to pointer is a `trivial conversion' according to the ARM. */
|
|
|
|
|
|
|
|
|
|
/* We should be doing much hairier argument matching (see section 13.2
|
2000-03-13 08:30:00 +01:00
|
|
|
|
of the ARM), but as a quick kludge, just check for the same type
|
|
|
|
|
code. */
|
2002-06-14 16:34:26 +02:00
|
|
|
|
if (TYPE_CODE (t1[i].type) != TYPE_CODE (VALUE_TYPE (t2[i])))
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return i + 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-06-14 16:34:26 +02:00
|
|
|
|
if (varargs || t2[i] == NULL)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return 0;
|
2002-06-14 16:34:26 +02:00
|
|
|
|
return i + 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function used by value_struct_elt to recurse through baseclasses.
|
|
|
|
|
Look for a field NAME in ARG1. Adjust the address of ARG1 by OFFSET bytes,
|
|
|
|
|
and search in it assuming it has (class) type TYPE.
|
|
|
|
|
If found, return value, else return NULL.
|
|
|
|
|
|
|
|
|
|
If LOOKING_FOR_BASECLASS, then instead of looking for struct fields,
|
|
|
|
|
look for a baseclass named NAME. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *
|
|
|
|
|
search_struct_field (char *name, struct value *arg1, int offset,
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
struct type *type, int looking_for_baseclass)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int nbases = TYPE_N_BASECLASSES (type);
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!looking_for_baseclass)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (i = TYPE_NFIELDS (type) - 1; i >= nbases; i--)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (type, i);
|
|
|
|
|
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (t_field_name && (strcmp_iw (t_field_name, name) == 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_FIELD_STATIC (type, i))
|
2002-08-20 01:19:53 +02:00
|
|
|
|
{
|
|
|
|
|
v = value_static_field (type, i);
|
|
|
|
|
if (v == 0)
|
|
|
|
|
error ("field %s is nonexistent or has been optimised out",
|
|
|
|
|
name);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2002-08-20 01:19:53 +02:00
|
|
|
|
{
|
|
|
|
|
v = value_primitive_field (arg1, offset, i, type);
|
|
|
|
|
if (v == 0)
|
|
|
|
|
error ("there is no field named %s", name);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (t_field_name
|
|
|
|
|
&& (t_field_name[0] == '\0'
|
|
|
|
|
|| (TYPE_CODE (type) == TYPE_CODE_UNION
|
2000-03-13 11:01:23 +01:00
|
|
|
|
&& (strcmp_iw (t_field_name, "else") == 0))))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *field_type = TYPE_FIELD_TYPE (type, i);
|
|
|
|
|
if (TYPE_CODE (field_type) == TYPE_CODE_UNION
|
|
|
|
|
|| TYPE_CODE (field_type) == TYPE_CODE_STRUCT)
|
|
|
|
|
{
|
|
|
|
|
/* Look for a match through the fields of an anonymous union,
|
|
|
|
|
or anonymous struct. C++ provides anonymous unions.
|
|
|
|
|
|
2003-01-02 Andrew Cagney <ac131313@redhat.com>
* valarith.c (value_binop): Delete obsolete code and comments.
* configure.host: Ditto.
* buildsym.h (make_blockvector): Ditto.
* buildsym.c (make_blockvector): Ditto.
* defs.h (enum language): Ditto.
(chill_demangle): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
(set_cu_language): Ditto.
(handle_producer): Ditto.
* expprint.c (print_subexp): Ditto.
* gdbtypes.c (chill_varying_type): Ditto.
* gdbtypes.h (builtin_type_chill_bool): Ditto.
(builtin_type_chill_char, builtin_type_chill_long): Ditto.
(builtin_type_chill_ulong, builtin_type_chill_real): Ditto.
(chill_varying_type): Ditto.
* language.h (_LANG_chill): Ditto.
* language.c (binop_result_type, integral_type): Ditto.
(character_type, string_type, structured_type): Ditto.
(lang_bool_type, binop_type_check): Ditto.
* stabsread.h (os9k_stabs): Ditto.
* stabsread.c (os9k_type_vector, dbx_lookup_type): Ditto.
(define_symbol, read_type, read_struct_fields): Ditto.
(read_array_type, read_enum_type, read_huge_number): Ditto.
(read_range_type, start_stabs): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* symtab.c (symbol_init_language_specific): Ditto.
(symbol_init_demangled_name, symbol_demangled_name): Ditto.
* symtab.h (struct general_symbol_info): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* typeprint.c (typedef_print): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* valops.c (value_cast, search_struct_field, value_slice): Delete
obsolete code.
(varying_to_slice): Delete function.
* value.h (COERCE_VARYING_ARRAY): Delete obsolete macro contents.
(varying_to_slice): Delete declaration.
* MAINTAINERS: Update.
2003-01-02 15:27:27 +01:00
|
|
|
|
In the GNU Chill (now deleted from GDB)
|
|
|
|
|
implementation of variant record types, each
|
|
|
|
|
<alternative field> has an (anonymous) union type,
|
|
|
|
|
each member of the union represents a <variant
|
|
|
|
|
alternative>. Each <variant alternative> is
|
|
|
|
|
represented as a struct, with a member for each
|
|
|
|
|
<variant field>. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int new_offset = offset;
|
|
|
|
|
|
2002-08-01 Andrew Cagney <cagney@redhat.com>
* NEWS: Menion that CHILL has been made obsolete.
* gdbtypes.c (chill_varying_type): Make chill references obsolete.
* gdbserver/Makefile.in: Ditto.
* stabsread.c (read_range_type): Ditto.
* gdbtypes.h: Ditto.
* language.c (binop_type_check): Ditto.
(binop_result_type): Ditto.
(integral_type): Ditto.
(character_type): Ditto.
(string_type): Ditto.
(boolean_type): Ditto.
(structured_type): Ditto.
(lang_bool_type): Ditto.
(binop_type_check): Ditto.
* language.h (_LANG_chill): Ditto.
* dwarfread.c (set_cu_language): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
* dwarfread.c (handle_producer): Ditto.
* expression.h (enum exp_opcode): Ditto.
* eval.c: Ditto for comments.
* typeprint.c (typedef_print) [_LANG_chill]: Ditto.
* expprint.c (print_subexp): Ditto.
(print_subexp): Ditto.
* valops.c (value_cast): Ditto.
(search_struct_field): Ditto.
* value.h (COERCE_VARYING_ARRAY): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* valarith.c (value_binop): Ditto.
(value_neg): Ditto.
* valops.c (value_slice): Ditto.
* symtab.h (union language_specific): Ditto.
(SYMBOL_INIT_LANGUAGE_SPECIFIC): Ditto.
(SYMBOL_DEMANGLED_NAME): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* defs.h (enum language): Ditto.
* symtab.c (got_symtab): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* ch-typeprint.c: Make file obsolete.
* ch-valprint.c: Make file obsolete.
* ch-lang.h: Make file obsolete.
* ch-exp.c: Make file obsolete.
* ch-lang.c: Make file obsolete.
* Makefile.in (FLAGS_TO_PASS): Do not pass CHILL or CHILLFLAGS or
CHILL_LIB.
(TARGET_FLAGS_TO_PASS): Ditto.
(CHILLFLAGS): Obsolete.
(CHILL): Obsolete.
(CHILL_FOR_TARGET): Obsolete.
(CHILL_LIB): Obsolete.
(SFILES): Remove ch-exp.c, ch-lang.c, ch-typeprint.c and
ch-valprint.c.
(HFILES_NO_SRCDIR): Remove ch-lang.h.
(COMMON_OBS): Remove ch-valprint.o, ch-typeprint.o, ch-exp.o and
ch-lang.o.
(ch-exp.o, ch-lang.o, ch-typeprint.o, ch-valprint.o): Delete
targets.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* stabs.texinfo, gdb.texinfo, gdbint.texinfo: Obsolete references
to CHILL.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,
CHILL_FOR_TARGET and CHILL_LIB.
* configure.in (configdirs): Remove gdb.chill.
* configure: Regenerate.
* lib/gdb.exp: Obsolete references to chill.
* gdb.fortran/types.exp: Ditto.
* gdb.fortran/exprs.exp: Ditto.
2002-08-01 19:18:35 +02:00
|
|
|
|
/* This is pretty gross. In G++, the offset in an
|
|
|
|
|
anonymous union is relative to the beginning of the
|
2003-01-02 Andrew Cagney <ac131313@redhat.com>
* valarith.c (value_binop): Delete obsolete code and comments.
* configure.host: Ditto.
* buildsym.h (make_blockvector): Ditto.
* buildsym.c (make_blockvector): Ditto.
* defs.h (enum language): Ditto.
(chill_demangle): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
(set_cu_language): Ditto.
(handle_producer): Ditto.
* expprint.c (print_subexp): Ditto.
* gdbtypes.c (chill_varying_type): Ditto.
* gdbtypes.h (builtin_type_chill_bool): Ditto.
(builtin_type_chill_char, builtin_type_chill_long): Ditto.
(builtin_type_chill_ulong, builtin_type_chill_real): Ditto.
(chill_varying_type): Ditto.
* language.h (_LANG_chill): Ditto.
* language.c (binop_result_type, integral_type): Ditto.
(character_type, string_type, structured_type): Ditto.
(lang_bool_type, binop_type_check): Ditto.
* stabsread.h (os9k_stabs): Ditto.
* stabsread.c (os9k_type_vector, dbx_lookup_type): Ditto.
(define_symbol, read_type, read_struct_fields): Ditto.
(read_array_type, read_enum_type, read_huge_number): Ditto.
(read_range_type, start_stabs): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* symtab.c (symbol_init_language_specific): Ditto.
(symbol_init_demangled_name, symbol_demangled_name): Ditto.
* symtab.h (struct general_symbol_info): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* typeprint.c (typedef_print): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* valops.c (value_cast, search_struct_field, value_slice): Delete
obsolete code.
(varying_to_slice): Delete function.
* value.h (COERCE_VARYING_ARRAY): Delete obsolete macro contents.
(varying_to_slice): Delete declaration.
* MAINTAINERS: Update.
2003-01-02 15:27:27 +01:00
|
|
|
|
enclosing struct. In the GNU Chill (now deleted
|
|
|
|
|
from GDB) implementation of variant records, the
|
|
|
|
|
bitpos is zero in an anonymous union field, so we
|
|
|
|
|
have to add the offset of the union here. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_CODE (field_type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| (TYPE_NFIELDS (field_type) > 0
|
|
|
|
|
&& TYPE_FIELD_BITPOS (field_type, 0) == 0))
|
|
|
|
|
new_offset += TYPE_FIELD_BITPOS (type, i) / 8;
|
|
|
|
|
|
|
|
|
|
v = search_struct_field (name, arg1, new_offset, field_type,
|
|
|
|
|
looking_for_baseclass);
|
|
|
|
|
if (v)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
for (i = 0; i < nbases; i++)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *basetype = check_typedef (TYPE_BASECLASS (type, i));
|
|
|
|
|
/* If we are looking for baseclasses, this is what we get when we
|
2000-03-13 08:30:00 +01:00
|
|
|
|
hit them. But it could happen that the base part's member name
|
|
|
|
|
is not yet filled in. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int found_baseclass = (looking_for_baseclass
|
|
|
|
|
&& TYPE_BASECLASS_NAME (type, i) != NULL
|
2000-03-13 11:01:23 +01:00
|
|
|
|
&& (strcmp_iw (name, TYPE_BASECLASS_NAME (type, i)) == 0));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
|
|
|
{
|
|
|
|
|
int boffset;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v2 = allocate_value (basetype);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
boffset = baseclass_offset (type, i,
|
|
|
|
|
VALUE_CONTENTS (arg1) + offset,
|
|
|
|
|
VALUE_ADDRESS (arg1)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
+ VALUE_OFFSET (arg1) + offset);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (boffset == -1)
|
|
|
|
|
error ("virtual baseclass botch");
|
|
|
|
|
|
|
|
|
|
/* The virtual base class pointer might have been clobbered by the
|
|
|
|
|
user program. Make sure that it still points to a valid memory
|
|
|
|
|
location. */
|
|
|
|
|
|
|
|
|
|
boffset += offset;
|
|
|
|
|
if (boffset < 0 || boffset >= TYPE_LENGTH (type))
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR base_addr;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
base_addr = VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1) + boffset;
|
|
|
|
|
if (target_read_memory (base_addr, VALUE_CONTENTS_RAW (v2),
|
|
|
|
|
TYPE_LENGTH (basetype)) != 0)
|
|
|
|
|
error ("virtual baseclass botch");
|
|
|
|
|
VALUE_LVAL (v2) = lval_memory;
|
|
|
|
|
VALUE_ADDRESS (v2) = base_addr;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
VALUE_LVAL (v2) = VALUE_LVAL (arg1);
|
|
|
|
|
VALUE_ADDRESS (v2) = VALUE_ADDRESS (arg1);
|
|
|
|
|
VALUE_OFFSET (v2) = VALUE_OFFSET (arg1) + boffset;
|
|
|
|
|
if (VALUE_LAZY (arg1))
|
|
|
|
|
VALUE_LAZY (v2) = 1;
|
|
|
|
|
else
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (v2),
|
|
|
|
|
VALUE_CONTENTS_RAW (arg1) + boffset,
|
|
|
|
|
TYPE_LENGTH (basetype));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (found_baseclass)
|
|
|
|
|
return v2;
|
|
|
|
|
v = search_struct_field (name, v2, 0, TYPE_BASECLASS (type, i),
|
|
|
|
|
looking_for_baseclass);
|
|
|
|
|
}
|
|
|
|
|
else if (found_baseclass)
|
|
|
|
|
v = value_primitive_field (arg1, offset, i, type);
|
|
|
|
|
else
|
|
|
|
|
v = search_struct_field (name, arg1,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
offset + TYPE_BASECLASS_BITPOS (type, i) / 8,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
basetype, looking_for_baseclass);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (v)
|
|
|
|
|
return v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the offset (in bytes) of the virtual base of type BASETYPE
|
|
|
|
|
* in an object pointed to by VALADDR (on the host), assumed to be of
|
|
|
|
|
* type TYPE. OFFSET is number of bytes beyond start of ARG to start
|
|
|
|
|
* looking (in case VALADDR is the contents of an enclosing object).
|
|
|
|
|
*
|
|
|
|
|
* This routine recurses on the primary base of the derived class because
|
|
|
|
|
* the virtual base entries of the primary base appear before the other
|
|
|
|
|
* virtual base entries.
|
|
|
|
|
*
|
|
|
|
|
* If the virtual base is not found, a negative integer is returned.
|
|
|
|
|
* The magnitude of the negative integer is the number of entries in
|
|
|
|
|
* the virtual table to skip over (entries corresponding to various
|
|
|
|
|
* ancestral classes in the chain of primary bases).
|
|
|
|
|
*
|
|
|
|
|
* Important: This assumes the HP / Taligent C++ runtime
|
|
|
|
|
* conventions. Use baseclass_offset() instead to deal with g++
|
|
|
|
|
* conventions. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
find_rt_vbase_offset (struct type *type, struct type *basetype, char *valaddr,
|
|
|
|
|
int offset, int *boffset_p, int *skip_p)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
int boffset; /* offset of virtual base */
|
|
|
|
|
int index; /* displacement to use in virtual table */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int skip;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *vp;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
CORE_ADDR vtbl; /* the virtual table pointer */
|
|
|
|
|
struct type *pbc; /* the primary base class */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Look for the virtual base recursively in the primary base, first.
|
|
|
|
|
* This is because the derived class object and its primary base
|
|
|
|
|
* subobject share the primary virtual table. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
boffset = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
pbc = TYPE_PRIMARY_BASE (type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (pbc)
|
|
|
|
|
{
|
|
|
|
|
find_rt_vbase_offset (pbc, basetype, valaddr, offset, &boffset, &skip);
|
|
|
|
|
if (skip < 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
*boffset_p = boffset;
|
|
|
|
|
*skip_p = -1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
skip = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the index of the virtual base according to HP/Taligent
|
|
|
|
|
runtime spec. (Depth-first, left-to-right.) */
|
|
|
|
|
index = virtual_base_index_skip_primaries (basetype, type);
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (index < 0)
|
|
|
|
|
{
|
|
|
|
|
*skip_p = skip + virtual_base_list_length_skip_primaries (type);
|
|
|
|
|
*boffset_p = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* pai: FIXME -- 32x64 possible problem */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* First word (4 bytes) in object layout is the vtable pointer */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
vtbl = *(CORE_ADDR *) (valaddr + offset);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Before the constructor is invoked, things are usually zero'd out. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (vtbl == 0)
|
|
|
|
|
error ("Couldn't find virtual table -- object may not be constructed yet.");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find virtual base's offset -- jump over entries for primary base
|
|
|
|
|
* ancestors, then use the index computed above. But also adjust by
|
|
|
|
|
* HP_ACC_VBASE_START for the vtable slots before the start of the
|
|
|
|
|
* virtual base entries. Offset is negative -- virtual base entries
|
|
|
|
|
* appear _before_ the address point of the virtual table. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2000-04-04 06:53:50 +02:00
|
|
|
|
/* pai: FIXME -- 32x64 problem, if word = 8 bytes, change multiplier
|
1999-07-07 22:19:36 +02:00
|
|
|
|
& use long type */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* epstein : FIXME -- added param for overlay section. May not be correct */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
vp = value_at (builtin_type_int, vtbl + 4 * (-skip - index - HP_ACC_VBASE_START), NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
boffset = value_as_long (vp);
|
|
|
|
|
*skip_p = -1;
|
|
|
|
|
*boffset_p = boffset;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper function used by value_struct_elt to recurse through baseclasses.
|
|
|
|
|
Look for a field NAME in ARG1. Adjust the address of ARG1 by OFFSET bytes,
|
|
|
|
|
and search in it assuming it has (class) type TYPE.
|
|
|
|
|
If found, return value, else if name matched and args not return (value)-1,
|
|
|
|
|
else return NULL. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *
|
|
|
|
|
search_struct_method (char *name, struct value **arg1p,
|
|
|
|
|
struct value **args, int offset,
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
int *static_memfuncp, struct type *type)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int name_matched = 0;
|
|
|
|
|
char dem_opname[64];
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; i--)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FN_FIELDLIST_NAME (type, i);
|
|
|
|
|
/* FIXME! May need to check for ARM demangling here */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (strncmp (t_field_name, "__", 2) == 0 ||
|
|
|
|
|
strncmp (t_field_name, "op", 2) == 0 ||
|
|
|
|
|
strncmp (t_field_name, "type", 4) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (cplus_demangle_opname (t_field_name, dem_opname, DMGL_ANSI))
|
|
|
|
|
t_field_name = dem_opname;
|
|
|
|
|
else if (cplus_demangle_opname (t_field_name, dem_opname, 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
t_field_name = dem_opname;
|
|
|
|
|
}
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (t_field_name && (strcmp_iw (t_field_name, name) == 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int j = TYPE_FN_FIELDLIST_LENGTH (type, i) - 1;
|
|
|
|
|
struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
name_matched = 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-09-14 04:09:39 +02:00
|
|
|
|
check_stub_method_group (type, i);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (j > 0 && args == 0)
|
|
|
|
|
error ("cannot resolve overloaded method `%s': no arguments supplied", name);
|
2002-02-04 03:14:46 +01:00
|
|
|
|
else if (j == 0 && args == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-02-04 03:14:46 +01:00
|
|
|
|
v = value_fn_field (arg1p, f, j, type, offset);
|
|
|
|
|
if (v != NULL)
|
|
|
|
|
return v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-02-04 03:14:46 +01:00
|
|
|
|
else
|
|
|
|
|
while (j >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (!typecmp (TYPE_FN_FIELD_STATIC_P (f, j),
|
2002-06-14 16:34:26 +02:00
|
|
|
|
TYPE_VARARGS (TYPE_FN_FIELD_TYPE (f, j)),
|
|
|
|
|
TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (f, j)),
|
2002-02-04 03:14:46 +01:00
|
|
|
|
TYPE_FN_FIELD_ARGS (f, j), args))
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
|
|
|
|
|
return value_virtual_fn_field (arg1p, f, j, type, offset);
|
|
|
|
|
if (TYPE_FN_FIELD_STATIC_P (f, j) && static_memfuncp)
|
|
|
|
|
*static_memfuncp = 1;
|
|
|
|
|
v = value_fn_field (arg1p, f, j, type, offset);
|
|
|
|
|
if (v != NULL)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
j--;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
|
|
|
|
|
{
|
|
|
|
|
int base_offset;
|
|
|
|
|
|
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_HAS_VTABLE (type))
|
|
|
|
|
{
|
|
|
|
|
/* HP aCC compiled type, search for virtual base offset
|
2000-03-13 08:30:00 +01:00
|
|
|
|
according to HP/Taligent runtime spec. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
int skip;
|
|
|
|
|
find_rt_vbase_offset (type, TYPE_BASECLASS (type, i),
|
|
|
|
|
VALUE_CONTENTS_ALL (*arg1p),
|
|
|
|
|
offset + VALUE_EMBEDDED_OFFSET (*arg1p),
|
|
|
|
|
&base_offset, &skip);
|
|
|
|
|
if (skip >= 0)
|
|
|
|
|
error ("Virtual base class offset not found in vtable");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
|
|
|
|
|
char *base_valaddr;
|
|
|
|
|
|
|
|
|
|
/* The virtual base class pointer might have been clobbered by the
|
2000-03-13 08:30:00 +01:00
|
|
|
|
user program. Make sure that it still points to a valid memory
|
|
|
|
|
location. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
if (offset < 0 || offset >= TYPE_LENGTH (type))
|
|
|
|
|
{
|
|
|
|
|
base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass));
|
|
|
|
|
if (target_read_memory (VALUE_ADDRESS (*arg1p)
|
|
|
|
|
+ VALUE_OFFSET (*arg1p) + offset,
|
|
|
|
|
base_valaddr,
|
|
|
|
|
TYPE_LENGTH (baseclass)) != 0)
|
|
|
|
|
error ("virtual baseclass botch");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
base_valaddr = VALUE_CONTENTS (*arg1p) + offset;
|
|
|
|
|
|
|
|
|
|
base_offset =
|
|
|
|
|
baseclass_offset (type, i, base_valaddr,
|
|
|
|
|
VALUE_ADDRESS (*arg1p)
|
|
|
|
|
+ VALUE_OFFSET (*arg1p) + offset);
|
|
|
|
|
if (base_offset == -1)
|
|
|
|
|
error ("virtual baseclass botch");
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
base_offset = TYPE_BASECLASS_BITPOS (type, i) / 8;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
v = search_struct_method (name, arg1p, args, base_offset + offset,
|
|
|
|
|
static_memfuncp, TYPE_BASECLASS (type, i));
|
2002-01-04 06:20:09 +01:00
|
|
|
|
if (v == (struct value *) - 1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
name_matched = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (v)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME-bothner: Why is this commented out? Why is it here? */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* *arg1p = arg1_tmp; */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return v;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (name_matched)
|
2002-01-04 06:20:09 +01:00
|
|
|
|
return (struct value *) - 1;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
else
|
|
|
|
|
return NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given *ARGP, a value of type (pointer to a)* structure/union,
|
|
|
|
|
extract the component named NAME from the ultimate target structure/union
|
|
|
|
|
and return it as a value with its appropriate type.
|
|
|
|
|
ERR is used in the error message if *ARGP's type is wrong.
|
|
|
|
|
|
|
|
|
|
C++: ARGS is a list of argument types to aid in the selection of
|
|
|
|
|
an appropriate method. Also, handle derived types.
|
|
|
|
|
|
|
|
|
|
STATIC_MEMFUNCP, if non-NULL, points to a caller-supplied location
|
|
|
|
|
where the truthvalue of whether the function that was resolved was
|
|
|
|
|
a static member function or not is stored.
|
|
|
|
|
|
|
|
|
|
ERR is an error message to be printed in case the field is not found. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_struct_elt (struct value **argp, struct value **args,
|
2000-07-30 03:48:28 +02:00
|
|
|
|
char *name, int *static_memfuncp, char *err)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct type *t;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
COERCE_ARRAY (*argp);
|
|
|
|
|
|
|
|
|
|
t = check_typedef (VALUE_TYPE (*argp));
|
|
|
|
|
|
|
|
|
|
/* Follow pointers until we get to a non-pointer. */
|
|
|
|
|
|
|
|
|
|
while (TYPE_CODE (t) == TYPE_CODE_PTR || TYPE_CODE (t) == TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
*argp = value_ind (*argp);
|
|
|
|
|
/* Don't coerce fn pointer to fn and then back again! */
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (*argp)) != TYPE_CODE_FUNC)
|
|
|
|
|
COERCE_ARRAY (*argp);
|
|
|
|
|
t = check_typedef (VALUE_TYPE (*argp));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_MEMBER)
|
|
|
|
|
error ("not implemented: member type in value_struct_elt");
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_CODE (t) != TYPE_CODE_STRUCT
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& TYPE_CODE (t) != TYPE_CODE_UNION)
|
|
|
|
|
error ("Attempt to extract a component of a value that is not a %s.", err);
|
|
|
|
|
|
|
|
|
|
/* Assume it's not, unless we see that it is. */
|
|
|
|
|
if (static_memfuncp)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*static_memfuncp = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!args)
|
|
|
|
|
{
|
|
|
|
|
/* if there are no arguments ...do this... */
|
|
|
|
|
|
|
|
|
|
/* Try as a field first, because if we succeed, there
|
2000-03-13 08:30:00 +01:00
|
|
|
|
is less work to be done. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
v = search_struct_field (name, *argp, 0, t, 0);
|
|
|
|
|
if (v)
|
|
|
|
|
return v;
|
|
|
|
|
|
|
|
|
|
/* C++: If it was not found as a data field, then try to
|
2000-03-13 08:30:00 +01:00
|
|
|
|
return it as a pointer to a method. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (destructor_name_p (name, t))
|
|
|
|
|
error ("Cannot get value of destructor");
|
|
|
|
|
|
|
|
|
|
v = search_struct_method (name, argp, args, 0, static_memfuncp, t);
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
if (v == (struct value *) - 1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("Cannot take address of a method");
|
|
|
|
|
else if (v == 0)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_NFN_FIELDS (t))
|
|
|
|
|
error ("There is no member or method named %s.", name);
|
|
|
|
|
else
|
|
|
|
|
error ("There is no member named %s.", name);
|
|
|
|
|
}
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (destructor_name_p (name, t))
|
|
|
|
|
{
|
|
|
|
|
if (!args[1])
|
|
|
|
|
{
|
|
|
|
|
/* Destructors are a special case. */
|
|
|
|
|
int m_index, f_index;
|
|
|
|
|
|
|
|
|
|
v = NULL;
|
|
|
|
|
if (get_destructor_fn_field (t, &m_index, &f_index))
|
|
|
|
|
{
|
|
|
|
|
v = value_fn_field (NULL, TYPE_FN_FIELDLIST1 (t, m_index),
|
|
|
|
|
f_index, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
if (v == NULL)
|
|
|
|
|
error ("could not find destructor function named %s.", name);
|
|
|
|
|
else
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
error ("destructor should not have any argument");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
v = search_struct_method (name, argp, args, 0, static_memfuncp, t);
|
2000-07-17 21:41:10 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
if (v == (struct value *) - 1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-07-17 21:41:10 +02:00
|
|
|
|
error ("One of the arguments you tried to pass to %s could not be converted to what the function wants.", name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else if (v == 0)
|
|
|
|
|
{
|
|
|
|
|
/* See if user tried to invoke data as function. If so,
|
2000-03-13 08:30:00 +01:00
|
|
|
|
hand it back. If it's not callable (i.e., a pointer to function),
|
|
|
|
|
gdb should give an error. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
v = search_struct_field (name, *argp, 0, t, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!v)
|
|
|
|
|
error ("Structure has no component named %s.", name);
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search through the methods of an object (and its bases)
|
|
|
|
|
* to find a specified method. Return the pointer to the
|
|
|
|
|
* fn_field list of overloaded instances.
|
|
|
|
|
* Helper function for value_find_oload_list.
|
|
|
|
|
* ARGP is a pointer to a pointer to a value (the object)
|
|
|
|
|
* METHOD is a string containing the method name
|
|
|
|
|
* OFFSET is the offset within the value
|
|
|
|
|
* TYPE is the assumed type of the object
|
|
|
|
|
* NUM_FNS is the number of overloaded instances
|
|
|
|
|
* BASETYPE is set to the actual type of the subobject where the method is found
|
|
|
|
|
* BOFFSET is the offset of the base subobject where the method is found */
|
|
|
|
|
|
1999-04-26 20:34:20 +02:00
|
|
|
|
static struct fn_field *
|
2002-01-04 06:20:09 +01:00
|
|
|
|
find_method_list (struct value **argp, char *method, int offset,
|
2002-05-12 04:20:38 +02:00
|
|
|
|
struct type *type, int *num_fns,
|
2000-07-30 03:48:28 +02:00
|
|
|
|
struct type **basetype, int *boffset)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct fn_field *f;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
|
|
|
|
|
*num_fns = 0;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* First check in object itself */
|
|
|
|
|
for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; i--)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* pai: FIXME What about operators and type conversions? */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
char *fn_field_name = TYPE_FN_FIELDLIST_NAME (type, i);
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (fn_field_name && (strcmp_iw (fn_field_name, method) == 0))
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
2002-05-12 04:20:38 +02:00
|
|
|
|
int len = TYPE_FN_FIELDLIST_LENGTH (type, i);
|
|
|
|
|
struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
|
|
|
|
|
|
|
|
|
|
*num_fns = len;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*basetype = type;
|
|
|
|
|
*boffset = offset;
|
2002-05-12 04:20:38 +02:00
|
|
|
|
|
2002-09-14 04:09:39 +02:00
|
|
|
|
/* Resolve any stub methods. */
|
|
|
|
|
check_stub_method_group (type, i);
|
2002-05-12 04:20:38 +02:00
|
|
|
|
|
|
|
|
|
return f;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Not found in object, check in base subobjects */
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
|
|
|
|
|
{
|
|
|
|
|
int base_offset;
|
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_HAS_VTABLE (type))
|
|
|
|
|
{
|
|
|
|
|
/* HP aCC compiled type, search for virtual base offset
|
|
|
|
|
* according to HP/Taligent runtime spec. */
|
|
|
|
|
int skip;
|
|
|
|
|
find_rt_vbase_offset (type, TYPE_BASECLASS (type, i),
|
|
|
|
|
VALUE_CONTENTS_ALL (*argp),
|
|
|
|
|
offset + VALUE_EMBEDDED_OFFSET (*argp),
|
|
|
|
|
&base_offset, &skip);
|
|
|
|
|
if (skip >= 0)
|
|
|
|
|
error ("Virtual base class offset not found in vtable");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* probably g++ runtime model */
|
|
|
|
|
base_offset = VALUE_OFFSET (*argp) + offset;
|
|
|
|
|
base_offset =
|
|
|
|
|
baseclass_offset (type, i,
|
|
|
|
|
VALUE_CONTENTS (*argp) + base_offset,
|
|
|
|
|
VALUE_ADDRESS (*argp) + base_offset);
|
|
|
|
|
if (base_offset == -1)
|
|
|
|
|
error ("virtual baseclass botch");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* non-virtual base, simply use bit position from debug info */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
base_offset = TYPE_BASECLASS_BITPOS (type, i) / 8;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
f = find_method_list (argp, method, base_offset + offset,
|
2002-05-12 04:20:38 +02:00
|
|
|
|
TYPE_BASECLASS (type, i), num_fns, basetype,
|
|
|
|
|
boffset);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (f)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return f;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the list of overloaded methods of a specified name.
|
|
|
|
|
* ARGP is a pointer to a pointer to a value (the object)
|
|
|
|
|
* METHOD is the method name
|
|
|
|
|
* OFFSET is the offset within the value contents
|
|
|
|
|
* NUM_FNS is the number of overloaded instances
|
|
|
|
|
* BASETYPE is set to the type of the base subobject that defines the method
|
|
|
|
|
* BOFFSET is the offset of the base subobject which defines the method */
|
|
|
|
|
|
|
|
|
|
struct fn_field *
|
2002-01-04 06:20:09 +01:00
|
|
|
|
value_find_oload_method_list (struct value **argp, char *method, int offset,
|
2002-05-12 04:20:38 +02:00
|
|
|
|
int *num_fns, struct type **basetype,
|
|
|
|
|
int *boffset)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *t;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
t = check_typedef (VALUE_TYPE (*argp));
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* code snarfed from value_struct_elt */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (TYPE_CODE (t) == TYPE_CODE_PTR || TYPE_CODE (t) == TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
*argp = value_ind (*argp);
|
|
|
|
|
/* Don't coerce fn pointer to fn and then back again! */
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (*argp)) != TYPE_CODE_FUNC)
|
|
|
|
|
COERCE_ARRAY (*argp);
|
|
|
|
|
t = check_typedef (VALUE_TYPE (*argp));
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_MEMBER)
|
|
|
|
|
error ("Not implemented: member type in value_find_oload_lis");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (t) != TYPE_CODE_STRUCT
|
|
|
|
|
&& TYPE_CODE (t) != TYPE_CODE_UNION)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("Attempt to extract a component of a value that is not a struct or union");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-05-12 04:20:38 +02:00
|
|
|
|
return find_method_list (argp, method, 0, t, num_fns, basetype, boffset);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given an array of argument types (ARGTYPES) (which includes an
|
|
|
|
|
entry for "this" in the case of C++ methods), the number of
|
|
|
|
|
arguments NARGS, the NAME of a function whether it's a method or
|
|
|
|
|
not (METHOD), and the degree of laxness (LAX) in conforming to
|
|
|
|
|
overload resolution rules in ANSI C++, find the best function that
|
|
|
|
|
matches on the argument types according to the overload resolution
|
|
|
|
|
rules.
|
|
|
|
|
|
|
|
|
|
In the case of class methods, the parameter OBJ is an object value
|
|
|
|
|
in which to search for overloaded methods.
|
|
|
|
|
|
|
|
|
|
In the case of non-method functions, the parameter FSYM is a symbol
|
|
|
|
|
corresponding to one of the overloaded functions.
|
|
|
|
|
|
|
|
|
|
Return value is an integer: 0 -> good match, 10 -> debugger applied
|
|
|
|
|
non-standard coercions, 100 -> incompatible.
|
|
|
|
|
|
|
|
|
|
If a method is being searched for, VALP will hold the value.
|
|
|
|
|
If a non-method is being searched for, SYMP will hold the symbol for it.
|
|
|
|
|
|
|
|
|
|
If a method is being searched for, and it is a static method,
|
|
|
|
|
then STATICP will point to a non-zero value.
|
|
|
|
|
|
|
|
|
|
Note: This function does *not* check the value of
|
|
|
|
|
overload_resolution. Caller must check it to see whether overload
|
|
|
|
|
resolution is permitted.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
find_overload_match (struct type **arg_types, int nargs, char *name, int method,
|
2002-01-04 18:51:38 +01:00
|
|
|
|
int lax, struct value **objp, struct symbol *fsym,
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value **valp, struct symbol **symp, int *staticp)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 18:51:38 +01:00
|
|
|
|
struct value *obj = (objp ? *objp : NULL);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
int oload_champ; /* Index of best overloaded function */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
struct badness_vector *oload_champ_bv = NULL; /* The measure for the current best match */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *temp = obj;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct fn_field *fns_ptr = NULL; /* For methods, the list of overloaded methods */
|
|
|
|
|
struct symbol **oload_syms = NULL; /* For non-methods, the list of overloaded function symbols */
|
|
|
|
|
int num_fns = 0; /* Number of overloaded instances being considered */
|
|
|
|
|
struct type *basetype = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int boffset;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int ix;
|
2002-05-12 04:20:38 +02:00
|
|
|
|
int static_offset;
|
2004-02-02 21:44:53 +01:00
|
|
|
|
struct cleanup *old_cleanups = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
const char *obj_type_name = NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
char *func_name = NULL;
|
2004-02-02 21:44:53 +01:00
|
|
|
|
enum oload_classification match_quality;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Get the list of overloaded methods or functions */
|
|
|
|
|
if (method)
|
|
|
|
|
{
|
|
|
|
|
obj_type_name = TYPE_NAME (VALUE_TYPE (obj));
|
|
|
|
|
/* Hack: evaluate_subexp_standard often passes in a pointer
|
2000-03-13 08:30:00 +01:00
|
|
|
|
value rather than the object itself, so try again */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if ((!obj_type_name || !*obj_type_name) &&
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(TYPE_CODE (VALUE_TYPE (obj)) == TYPE_CODE_PTR))
|
|
|
|
|
obj_type_name = TYPE_NAME (TYPE_TARGET_TYPE (VALUE_TYPE (obj)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
fns_ptr = value_find_oload_method_list (&temp, name, 0,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
&num_fns,
|
|
|
|
|
&basetype, &boffset);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!fns_ptr || !num_fns)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
error ("Couldn't find method %s%s%s",
|
|
|
|
|
obj_type_name,
|
|
|
|
|
(obj_type_name && *obj_type_name) ? "::" : "",
|
|
|
|
|
name);
|
2002-05-12 04:20:38 +02:00
|
|
|
|
/* If we are dealing with stub method types, they should have
|
|
|
|
|
been resolved by find_method_list via value_find_oload_method_list
|
|
|
|
|
above. */
|
|
|
|
|
gdb_assert (TYPE_DOMAIN_TYPE (fns_ptr[0].type) != NULL);
|
2004-02-02 21:44:53 +01:00
|
|
|
|
oload_champ = find_oload_champ (arg_types, nargs, method, num_fns,
|
|
|
|
|
fns_ptr, oload_syms, &oload_champ_bv);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-02-02 21:44:53 +01:00
|
|
|
|
const char *qualified_name = SYMBOL_CPLUS_DEMANGLED_NAME (fsym);
|
|
|
|
|
func_name = cp_func_name (qualified_name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-10-19 04:47:02 +02:00
|
|
|
|
/* If the name is NULL this must be a C-style function.
|
2000-03-13 08:30:00 +01:00
|
|
|
|
Just return the same symbol. */
|
2004-02-02 21:44:53 +01:00
|
|
|
|
if (func_name == NULL)
|
2000-03-13 08:30:00 +01:00
|
|
|
|
{
|
1999-10-19 04:47:02 +02:00
|
|
|
|
*symp = fsym;
|
2000-03-13 08:30:00 +01:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-10-19 04:47:02 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
old_cleanups = make_cleanup (xfree, func_name);
|
|
|
|
|
make_cleanup (xfree, oload_syms);
|
|
|
|
|
make_cleanup (xfree, oload_champ_bv);
|
|
|
|
|
|
|
|
|
|
oload_champ = find_oload_champ_namespace (arg_types, nargs,
|
|
|
|
|
func_name,
|
|
|
|
|
qualified_name,
|
|
|
|
|
&oload_syms,
|
|
|
|
|
&oload_champ_bv);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check how bad the best match is. */
|
|
|
|
|
|
|
|
|
|
match_quality
|
|
|
|
|
= classify_oload_match (oload_champ_bv, nargs,
|
|
|
|
|
oload_method_static (method, fns_ptr,
|
|
|
|
|
oload_champ));
|
|
|
|
|
|
|
|
|
|
if (match_quality == INCOMPATIBLE)
|
|
|
|
|
{
|
|
|
|
|
if (method)
|
|
|
|
|
error ("Cannot resolve method %s%s%s to any overloaded instance",
|
|
|
|
|
obj_type_name,
|
|
|
|
|
(obj_type_name && *obj_type_name) ? "::" : "",
|
|
|
|
|
name);
|
|
|
|
|
else
|
|
|
|
|
error ("Cannot resolve function %s to any overloaded instance",
|
|
|
|
|
func_name);
|
|
|
|
|
}
|
|
|
|
|
else if (match_quality == NON_STANDARD)
|
|
|
|
|
{
|
|
|
|
|
if (method)
|
|
|
|
|
warning ("Using non-standard conversion to match method %s%s%s to supplied arguments",
|
|
|
|
|
obj_type_name,
|
|
|
|
|
(obj_type_name && *obj_type_name) ? "::" : "",
|
|
|
|
|
name);
|
|
|
|
|
else
|
|
|
|
|
warning ("Using non-standard conversion to match function %s to supplied arguments",
|
|
|
|
|
func_name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (method)
|
|
|
|
|
{
|
|
|
|
|
if (staticp != NULL)
|
|
|
|
|
*staticp = oload_method_static (method, fns_ptr, oload_champ);
|
|
|
|
|
if (TYPE_FN_FIELD_VIRTUAL_P (fns_ptr, oload_champ))
|
|
|
|
|
*valp = value_virtual_fn_field (&temp, fns_ptr, oload_champ, basetype, boffset);
|
|
|
|
|
else
|
|
|
|
|
*valp = value_fn_field (&temp, fns_ptr, oload_champ, basetype, boffset);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*symp = oload_syms[oload_champ];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (objp)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (temp)) != TYPE_CODE_PTR
|
|
|
|
|
&& TYPE_CODE (VALUE_TYPE (*objp)) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
temp = value_addr (temp);
|
|
|
|
|
}
|
|
|
|
|
*objp = temp;
|
|
|
|
|
}
|
|
|
|
|
if (old_cleanups != NULL)
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
|
|
|
|
|
switch (match_quality)
|
|
|
|
|
{
|
|
|
|
|
case INCOMPATIBLE:
|
|
|
|
|
return 100;
|
|
|
|
|
case NON_STANDARD:
|
|
|
|
|
return 10;
|
|
|
|
|
default: /* STANDARD */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find the best overload match, searching for FUNC_NAME in namespaces
|
|
|
|
|
contained in QUALIFIED_NAME until it either finds a good match or
|
|
|
|
|
runs out of namespaces. It stores the overloaded functions in
|
|
|
|
|
*OLOAD_SYMS, and the badness vector in *OLOAD_CHAMP_BV. The
|
|
|
|
|
calling function is responsible for freeing *OLOAD_SYMS and
|
|
|
|
|
*OLOAD_CHAMP_BV. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
find_oload_champ_namespace (struct type **arg_types, int nargs,
|
|
|
|
|
const char *func_name,
|
|
|
|
|
const char *qualified_name,
|
|
|
|
|
struct symbol ***oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv)
|
|
|
|
|
{
|
|
|
|
|
int oload_champ;
|
|
|
|
|
|
|
|
|
|
find_oload_champ_namespace_loop (arg_types, nargs,
|
|
|
|
|
func_name,
|
|
|
|
|
qualified_name, 0,
|
|
|
|
|
oload_syms, oload_champ_bv,
|
|
|
|
|
&oload_champ);
|
|
|
|
|
|
|
|
|
|
return oload_champ;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function for find_oload_champ_namespace; NAMESPACE_LEN is
|
|
|
|
|
how deep we've looked for namespaces, and the champ is stored in
|
|
|
|
|
OLOAD_CHAMP. The return value is 1 if the champ is a good one, 0
|
|
|
|
|
if it isn't.
|
|
|
|
|
|
|
|
|
|
It is the caller's responsibility to free *OLOAD_SYMS and
|
|
|
|
|
*OLOAD_CHAMP_BV. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
|
|
|
|
|
const char *func_name,
|
|
|
|
|
const char *qualified_name,
|
|
|
|
|
int namespace_len,
|
|
|
|
|
struct symbol ***oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv,
|
|
|
|
|
int *oload_champ)
|
|
|
|
|
{
|
|
|
|
|
int next_namespace_len = namespace_len;
|
|
|
|
|
int searched_deeper = 0;
|
|
|
|
|
int num_fns = 0;
|
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
|
int new_oload_champ;
|
|
|
|
|
struct symbol **new_oload_syms;
|
|
|
|
|
struct badness_vector *new_oload_champ_bv;
|
|
|
|
|
char *new_namespace;
|
|
|
|
|
|
|
|
|
|
if (next_namespace_len != 0)
|
|
|
|
|
{
|
|
|
|
|
gdb_assert (qualified_name[next_namespace_len] == ':');
|
|
|
|
|
next_namespace_len += 2;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2004-02-02 21:44:53 +01:00
|
|
|
|
next_namespace_len
|
|
|
|
|
+= cp_find_first_component (qualified_name + next_namespace_len);
|
|
|
|
|
|
|
|
|
|
/* Initialize these to values that can safely be xfree'd. */
|
|
|
|
|
*oload_syms = NULL;
|
|
|
|
|
*oload_champ_bv = NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
/* First, see if we have a deeper namespace we can search in. If we
|
|
|
|
|
get a good match there, use it. */
|
|
|
|
|
|
|
|
|
|
if (qualified_name[next_namespace_len] == ':')
|
|
|
|
|
{
|
|
|
|
|
searched_deeper = 1;
|
|
|
|
|
|
|
|
|
|
if (find_oload_champ_namespace_loop (arg_types, nargs,
|
|
|
|
|
func_name, qualified_name,
|
|
|
|
|
next_namespace_len,
|
|
|
|
|
oload_syms, oload_champ_bv,
|
|
|
|
|
oload_champ))
|
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* If we reach here, either we're in the deepest namespace or we
|
|
|
|
|
didn't find a good match in a deeper namespace. But, in the
|
|
|
|
|
latter case, we still have a bad match in a deeper namespace;
|
|
|
|
|
note that we might not find any match at all in the current
|
|
|
|
|
namespace. (There's always a match in the deepest namespace,
|
|
|
|
|
because this overload mechanism only gets called if there's a
|
|
|
|
|
function symbol to start off with.) */
|
|
|
|
|
|
|
|
|
|
old_cleanups = make_cleanup (xfree, *oload_syms);
|
|
|
|
|
old_cleanups = make_cleanup (xfree, *oload_champ_bv);
|
|
|
|
|
new_namespace = alloca (namespace_len + 1);
|
|
|
|
|
strncpy (new_namespace, qualified_name, namespace_len);
|
|
|
|
|
new_namespace[namespace_len] = '\0';
|
|
|
|
|
new_oload_syms = make_symbol_overload_list (func_name,
|
|
|
|
|
new_namespace);
|
|
|
|
|
while (new_oload_syms[num_fns])
|
|
|
|
|
++num_fns;
|
|
|
|
|
|
|
|
|
|
new_oload_champ = find_oload_champ (arg_types, nargs, 0, num_fns,
|
|
|
|
|
NULL, new_oload_syms,
|
|
|
|
|
&new_oload_champ_bv);
|
|
|
|
|
|
|
|
|
|
/* Case 1: We found a good match. Free earlier matches (if any),
|
|
|
|
|
and return it. Case 2: We didn't find a good match, but we're
|
|
|
|
|
not the deepest function. Then go with the bad match that the
|
|
|
|
|
deeper function found. Case 3: We found a bad match, and we're
|
|
|
|
|
the deepest function. Then return what we found, even though
|
|
|
|
|
it's a bad match. */
|
|
|
|
|
|
|
|
|
|
if (new_oload_champ != -1
|
|
|
|
|
&& classify_oload_match (new_oload_champ_bv, nargs, 0) == STANDARD)
|
|
|
|
|
{
|
|
|
|
|
*oload_syms = new_oload_syms;
|
|
|
|
|
*oload_champ = new_oload_champ;
|
|
|
|
|
*oload_champ_bv = new_oload_champ_bv;
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else if (searched_deeper)
|
|
|
|
|
{
|
|
|
|
|
xfree (new_oload_syms);
|
|
|
|
|
xfree (new_oload_champ_bv);
|
|
|
|
|
discard_cleanups (old_cleanups);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
gdb_assert (new_oload_champ != -1);
|
|
|
|
|
*oload_syms = new_oload_syms;
|
|
|
|
|
*oload_champ = new_oload_champ;
|
|
|
|
|
*oload_champ_bv = new_oload_champ_bv;
|
|
|
|
|
discard_cleanups (old_cleanups);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look for a function to take NARGS args of types ARG_TYPES. Find
|
|
|
|
|
the best match from among the overloaded methods or functions
|
|
|
|
|
(depending on METHOD) given by FNS_PTR or OLOAD_SYMS, respectively.
|
|
|
|
|
The number of methods/functions in the list is given by NUM_FNS.
|
|
|
|
|
Return the index of the best match; store an indication of the
|
|
|
|
|
quality of the match in OLOAD_CHAMP_BV.
|
|
|
|
|
|
|
|
|
|
It is the caller's responsibility to free *OLOAD_CHAMP_BV. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
find_oload_champ (struct type **arg_types, int nargs, int method,
|
|
|
|
|
int num_fns, struct fn_field *fns_ptr,
|
|
|
|
|
struct symbol **oload_syms,
|
|
|
|
|
struct badness_vector **oload_champ_bv)
|
|
|
|
|
{
|
|
|
|
|
int ix;
|
|
|
|
|
struct badness_vector *bv; /* A measure of how good an overloaded instance is */
|
|
|
|
|
int oload_champ = -1; /* Index of best overloaded function */
|
|
|
|
|
int oload_ambiguous = 0; /* Current ambiguity state for overload resolution */
|
|
|
|
|
/* 0 => no ambiguity, 1 => two good funcs, 2 => incomparable funcs */
|
|
|
|
|
|
|
|
|
|
*oload_champ_bv = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Consider each candidate in turn */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (ix = 0; ix < num_fns; ix++)
|
|
|
|
|
{
|
2004-02-02 21:44:53 +01:00
|
|
|
|
int jj;
|
|
|
|
|
int static_offset = oload_method_static (method, fns_ptr, ix);
|
|
|
|
|
int nparms;
|
|
|
|
|
struct type **parm_types;
|
|
|
|
|
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (method)
|
|
|
|
|
{
|
2002-06-14 16:34:26 +02:00
|
|
|
|
nparms = TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (fns_ptr, ix));
|
2000-03-13 11:01:23 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* If it's not a method, this is the proper place */
|
|
|
|
|
nparms=TYPE_NFIELDS(SYMBOL_TYPE(oload_syms[ix]));
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Prepare array of parameter types */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
parm_types = (struct type **) xmalloc (nparms * (sizeof (struct type *)));
|
|
|
|
|
for (jj = 0; jj < nparms; jj++)
|
2000-03-13 11:01:23 +01:00
|
|
|
|
parm_types[jj] = (method
|
2002-06-14 16:34:26 +02:00
|
|
|
|
? (TYPE_FN_FIELD_ARGS (fns_ptr, ix)[jj].type)
|
2000-03-13 11:01:23 +01:00
|
|
|
|
: TYPE_FIELD_TYPE (SYMBOL_TYPE (oload_syms[ix]), jj));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-05-12 04:20:38 +02:00
|
|
|
|
/* Compare parameter types to supplied argument types. Skip THIS for
|
|
|
|
|
static methods. */
|
|
|
|
|
bv = rank_function (parm_types, nparms, arg_types + static_offset,
|
|
|
|
|
nargs - static_offset);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
if (!*oload_champ_bv)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
2004-02-02 21:44:53 +01:00
|
|
|
|
*oload_champ_bv = bv;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
oload_champ = 0;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* See whether current candidate is better or worse than previous best */
|
2004-02-02 21:44:53 +01:00
|
|
|
|
switch (compare_badness (bv, *oload_champ_bv))
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
oload_ambiguous = 1; /* top two contenders are equally good */
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
oload_ambiguous = 2; /* incomparable top contenders */
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
2004-02-02 21:44:53 +01:00
|
|
|
|
*oload_champ_bv = bv; /* new champion, record details */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
oload_ambiguous = 0;
|
|
|
|
|
oload_champ = ix;
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (parm_types);
|
2000-07-09 07:15:50 +02:00
|
|
|
|
if (overload_debug)
|
|
|
|
|
{
|
|
|
|
|
if (method)
|
|
|
|
|
fprintf_filtered (gdb_stderr,"Overloaded method instance %s, # of parms %d\n", fns_ptr[ix].physname, nparms);
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (gdb_stderr,"Overloaded function instance %s # of parms %d\n", SYMBOL_DEMANGLED_NAME (oload_syms[ix]), nparms);
|
2002-05-12 04:20:38 +02:00
|
|
|
|
for (jj = 0; jj < nargs - static_offset; jj++)
|
2000-07-09 07:15:50 +02:00
|
|
|
|
fprintf_filtered (gdb_stderr,"...Badness @ %d : %d\n", jj, bv->rank[jj]);
|
|
|
|
|
fprintf_filtered (gdb_stderr,"Overload resolution champion is %d, ambiguous? %d\n", oload_champ, oload_ambiguous);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
return oload_champ;
|
|
|
|
|
}
|
2000-07-09 07:15:50 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
/* Return 1 if we're looking at a static method, 0 if we're looking at
|
|
|
|
|
a non-static method or a function that isn't a method. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
static int
|
|
|
|
|
oload_method_static (int method, struct fn_field *fns_ptr, int index)
|
|
|
|
|
{
|
|
|
|
|
if (method && TYPE_FN_FIELD_STATIC_P (fns_ptr, index))
|
|
|
|
|
return 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2004-02-02 21:44:53 +01:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
/* Check how good an overload match OLOAD_CHAMP_BV represents. */
|
|
|
|
|
|
|
|
|
|
static enum oload_classification
|
|
|
|
|
classify_oload_match (struct badness_vector *oload_champ_bv,
|
|
|
|
|
int nargs,
|
|
|
|
|
int static_offset)
|
|
|
|
|
{
|
|
|
|
|
int ix;
|
|
|
|
|
|
|
|
|
|
for (ix = 1; ix <= nargs - static_offset; ix++)
|
2002-01-04 18:51:38 +01:00
|
|
|
|
{
|
2004-02-02 21:44:53 +01:00
|
|
|
|
if (oload_champ_bv->rank[ix] >= 100)
|
|
|
|
|
return INCOMPATIBLE; /* truly mismatched types */
|
|
|
|
|
else if (oload_champ_bv->rank[ix] >= 10)
|
|
|
|
|
return NON_STANDARD; /* non-standard type conversions needed */
|
2002-01-04 18:51:38 +01:00
|
|
|
|
}
|
2002-07-10 19:18:16 +02:00
|
|
|
|
|
2004-02-02 21:44:53 +01:00
|
|
|
|
return STANDARD; /* Only standard conversions needed. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* C++: return 1 is NAME is a legitimate name for the destructor
|
|
|
|
|
of type TYPE. If TYPE does not have a destructor, or
|
|
|
|
|
if NAME is inappropriate for TYPE, an error is signaled. */
|
|
|
|
|
int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
destructor_name_p (const char *name, const struct type *type)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* destructors are a special case. */
|
|
|
|
|
|
|
|
|
|
if (name[0] == '~')
|
|
|
|
|
{
|
|
|
|
|
char *dname = type_name_no_tag (type);
|
|
|
|
|
char *cp = strchr (dname, '<');
|
|
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
|
|
/* Do not compare the template part for template classes. */
|
|
|
|
|
if (cp == NULL)
|
|
|
|
|
len = strlen (dname);
|
|
|
|
|
else
|
|
|
|
|
len = cp - dname;
|
2003-11-06 23:54:02 +01:00
|
|
|
|
if (strlen (name + 1) != len || strncmp (dname, name + 1, len) != 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("name of destructor must equal name of class");
|
|
|
|
|
else
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function for check_field: Given TYPE, a structure/union,
|
|
|
|
|
return 1 if the component named NAME from the ultimate
|
|
|
|
|
target structure/union is defined, otherwise, return 0. */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
check_field_in (struct type *type, const char *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int i;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
for (i = TYPE_NFIELDS (type) - 1; i >= TYPE_N_BASECLASSES (type); i--)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (type, i);
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (t_field_name && (strcmp_iw (t_field_name, name) == 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* C++: If it was not found as a data field, then try to
|
|
|
|
|
return it as a pointer to a method. */
|
|
|
|
|
|
|
|
|
|
/* Destructors are a special case. */
|
|
|
|
|
if (destructor_name_p (name, type))
|
|
|
|
|
{
|
|
|
|
|
int m_index, f_index;
|
|
|
|
|
|
|
|
|
|
return get_destructor_fn_field (type, &m_index, &f_index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; --i)
|
|
|
|
|
{
|
2000-03-13 11:01:23 +01:00
|
|
|
|
if (strcmp_iw (TYPE_FN_FIELDLIST_NAME (type, i), name) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
|
|
|
|
|
if (check_field_in (TYPE_BASECLASS (type, i), name))
|
|
|
|
|
return 1;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* C++: Given ARG1, a value of type (pointer to a)* structure/union,
|
|
|
|
|
return 1 if the component named NAME from the ultimate
|
|
|
|
|
target structure/union is defined, otherwise, return 0. */
|
|
|
|
|
|
|
|
|
|
int
|
2002-01-04 06:20:09 +01:00
|
|
|
|
check_field (struct value *arg1, const char *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct type *t;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
COERCE_ARRAY (arg1);
|
|
|
|
|
|
|
|
|
|
t = VALUE_TYPE (arg1);
|
|
|
|
|
|
|
|
|
|
/* Follow pointers until we get to a non-pointer. */
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
CHECK_TYPEDEF (t);
|
|
|
|
|
if (TYPE_CODE (t) != TYPE_CODE_PTR && TYPE_CODE (t) != TYPE_CODE_REF)
|
|
|
|
|
break;
|
|
|
|
|
t = TYPE_TARGET_TYPE (t);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_MEMBER)
|
|
|
|
|
error ("not implemented: member type in check_field");
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_CODE (t) != TYPE_CODE_STRUCT
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& TYPE_CODE (t) != TYPE_CODE_UNION)
|
|
|
|
|
error ("Internal error: `this' is not an aggregate");
|
|
|
|
|
|
|
|
|
|
return check_field_in (t, name);
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-25 18:39:39 +02:00
|
|
|
|
/* C++: Given an aggregate type CURTYPE, and a member name NAME,
|
|
|
|
|
return the appropriate member. This function is used to resolve
|
|
|
|
|
user expressions of the form "DOMAIN::NAME". For more details on
|
|
|
|
|
what happens, see the comment before
|
|
|
|
|
value_struct_elt_for_reference. */
|
|
|
|
|
|
|
|
|
|
struct value *
|
|
|
|
|
value_aggregate_elt (struct type *curtype,
|
|
|
|
|
char *name,
|
|
|
|
|
enum noside noside)
|
|
|
|
|
{
|
|
|
|
|
switch (TYPE_CODE (curtype))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
return value_struct_elt_for_reference (curtype, 0, curtype, name, NULL,
|
|
|
|
|
noside);
|
2003-09-25 18:39:39 +02:00
|
|
|
|
case TYPE_CODE_NAMESPACE:
|
|
|
|
|
return value_namespace_elt (curtype, name, noside);
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
"non-aggregate type in value_aggregate_elt");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* C++: Given an aggregate type CURTYPE, and a member name NAME,
|
|
|
|
|
return the address of this member as a "pointer to member"
|
|
|
|
|
type. If INTYPE is non-null, then it will be the type
|
|
|
|
|
of the member we are looking for. This will help us resolve
|
|
|
|
|
"pointers to member functions". This function is used
|
|
|
|
|
to resolve user expressions of the form "DOMAIN::NAME". */
|
|
|
|
|
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_struct_elt_for_reference (struct type *domain, int offset,
|
|
|
|
|
struct type *curtype, char *name,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
struct type *intype,
|
|
|
|
|
enum noside noside)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct type *t = curtype;
|
|
|
|
|
int i;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (TYPE_CODE (t) != TYPE_CODE_STRUCT
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& TYPE_CODE (t) != TYPE_CODE_UNION)
|
|
|
|
|
error ("Internal error: non-aggregate type to value_struct_elt_for_reference");
|
|
|
|
|
|
|
|
|
|
for (i = TYPE_NFIELDS (t) - 1; i >= TYPE_N_BASECLASSES (t); i--)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (t, i);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2003-11-08 01:13:03 +01:00
|
|
|
|
if (t_field_name && strcmp (t_field_name, name) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (TYPE_FIELD_STATIC (t, i))
|
|
|
|
|
{
|
|
|
|
|
v = value_static_field (t, i);
|
|
|
|
|
if (v == NULL)
|
2002-08-20 01:19:53 +02:00
|
|
|
|
error ("static field %s has been optimized out",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
name);
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
if (TYPE_FIELD_PACKED (t, i))
|
|
|
|
|
error ("pointers to bitfield members not allowed");
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return value_from_longest
|
|
|
|
|
(lookup_reference_type (lookup_member_type (TYPE_FIELD_TYPE (t, i),
|
|
|
|
|
domain)),
|
|
|
|
|
offset + (LONGEST) (TYPE_FIELD_BITPOS (t, i) >> 3));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* C++: If it was not found as a data field, then try to
|
|
|
|
|
return it as a pointer to a method. */
|
|
|
|
|
|
|
|
|
|
/* Destructors are a special case. */
|
|
|
|
|
if (destructor_name_p (name, t))
|
|
|
|
|
{
|
|
|
|
|
error ("member pointers to destructors not implemented yet");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Perform all necessary dereferencing. */
|
|
|
|
|
while (intype && TYPE_CODE (intype) == TYPE_CODE_PTR)
|
|
|
|
|
intype = TYPE_TARGET_TYPE (intype);
|
|
|
|
|
|
|
|
|
|
for (i = TYPE_NFN_FIELDS (t) - 1; i >= 0; --i)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FN_FIELDLIST_NAME (t, i);
|
|
|
|
|
char dem_opname[64];
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (strncmp (t_field_name, "__", 2) == 0 ||
|
|
|
|
|
strncmp (t_field_name, "op", 2) == 0 ||
|
|
|
|
|
strncmp (t_field_name, "type", 4) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (cplus_demangle_opname (t_field_name, dem_opname, DMGL_ANSI))
|
|
|
|
|
t_field_name = dem_opname;
|
|
|
|
|
else if (cplus_demangle_opname (t_field_name, dem_opname, 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
t_field_name = dem_opname;
|
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
if (t_field_name && strcmp (t_field_name, name) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int j = TYPE_FN_FIELDLIST_LENGTH (t, i);
|
|
|
|
|
struct fn_field *f = TYPE_FN_FIELDLIST1 (t, i);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-09-14 04:09:39 +02:00
|
|
|
|
check_stub_method_group (t, i);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (intype == 0 && j > 1)
|
|
|
|
|
error ("non-unique member `%s' requires type instantiation", name);
|
|
|
|
|
if (intype)
|
|
|
|
|
{
|
|
|
|
|
while (j--)
|
|
|
|
|
if (TYPE_FN_FIELD_TYPE (f, j) == intype)
|
|
|
|
|
break;
|
|
|
|
|
if (j < 0)
|
|
|
|
|
error ("no member function matches that type instantiation");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
j = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
|
|
|
|
|
{
|
|
|
|
|
return value_from_longest
|
|
|
|
|
(lookup_reference_type
|
|
|
|
|
(lookup_member_type (TYPE_FN_FIELD_TYPE (f, j),
|
|
|
|
|
domain)),
|
|
|
|
|
(LONGEST) METHOD_PTR_FROM_VOFFSET (TYPE_FN_FIELD_VOFFSET (f, j)));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct symbol *s = lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, j),
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
0, VAR_DOMAIN, 0, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (s == NULL)
|
|
|
|
|
{
|
|
|
|
|
v = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
v = read_var_value (s, 0);
|
|
|
|
|
#if 0
|
|
|
|
|
VALUE_TYPE (v) = lookup_reference_type
|
|
|
|
|
(lookup_member_type (TYPE_FN_FIELD_TYPE (f, j),
|
|
|
|
|
domain));
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (t) - 1; i >= 0; i--)
|
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *v;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int base_offset;
|
|
|
|
|
|
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (t, i))
|
|
|
|
|
base_offset = 0;
|
|
|
|
|
else
|
|
|
|
|
base_offset = TYPE_BASECLASS_BITPOS (t, i) / 8;
|
|
|
|
|
v = value_struct_elt_for_reference (domain,
|
|
|
|
|
offset + base_offset,
|
|
|
|
|
TYPE_BASECLASS (t, i),
|
|
|
|
|
name,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
intype,
|
|
|
|
|
noside);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (v)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
/* As a last chance, pretend that CURTYPE is a namespace, and look
|
|
|
|
|
it up that way; this (frequently) works for types nested inside
|
|
|
|
|
classes. */
|
|
|
|
|
|
|
|
|
|
return value_maybe_namespace_elt (curtype, name, noside);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-25 18:39:39 +02:00
|
|
|
|
/* C++: Return the member NAME of the namespace given by the type
|
|
|
|
|
CURTYPE. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
value_namespace_elt (const struct type *curtype,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
char *name,
|
2003-09-25 18:39:39 +02:00
|
|
|
|
enum noside noside)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *retval = value_maybe_namespace_elt (curtype, name,
|
|
|
|
|
noside);
|
|
|
|
|
|
|
|
|
|
if (retval == NULL)
|
|
|
|
|
error ("No symbol \"%s\" in namespace \"%s\".", name,
|
|
|
|
|
TYPE_TAG_NAME (curtype));
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A helper function used by value_namespace_elt and
|
|
|
|
|
value_struct_elt_for_reference. It looks up NAME inside the
|
|
|
|
|
context CURTYPE; this works if CURTYPE is a namespace or if CURTYPE
|
|
|
|
|
is a class and NAME refers to a type in CURTYPE itself (as opposed
|
|
|
|
|
to, say, some base class of CURTYPE). */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
value_maybe_namespace_elt (const struct type *curtype,
|
|
|
|
|
char *name,
|
|
|
|
|
enum noside noside)
|
2003-09-25 18:39:39 +02:00
|
|
|
|
{
|
|
|
|
|
const char *namespace_name = TYPE_TAG_NAME (curtype);
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
sym = cp_lookup_symbol_namespace (namespace_name, name, NULL,
|
|
|
|
|
get_selected_block (0), VAR_DOMAIN,
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
if (sym == NULL)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
return NULL;
|
2003-09-25 18:39:39 +02:00
|
|
|
|
else if ((noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
&& (SYMBOL_CLASS (sym) == LOC_TYPEDEF))
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
return allocate_value (SYMBOL_TYPE (sym));
|
2003-09-25 18:39:39 +02:00
|
|
|
|
else
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
return value_of_variable (sym, get_selected_block (0));
|
2003-09-25 18:39:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Given a pointer value V, find the real (RTTI) type
|
|
|
|
|
of the object it points to.
|
|
|
|
|
Other parameters FULL, TOP, USING_ENC as with value_rtti_type()
|
|
|
|
|
and refer to the values computed for the object pointed to. */
|
|
|
|
|
|
|
|
|
|
struct type *
|
2002-01-04 06:20:09 +01:00
|
|
|
|
value_rtti_target_type (struct value *v, int *full, int *top, int *using_enc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *target;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
target = value_ind (v);
|
|
|
|
|
|
|
|
|
|
return value_rtti_type (target, full, top, using_enc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a value pointed to by ARGP, check its real run-time type, and
|
|
|
|
|
if that is different from the enclosing type, create a new value
|
|
|
|
|
using the real run-time type as the enclosing type (and of the same
|
|
|
|
|
type as ARGP) and return it, with the embedded offset adjusted to
|
|
|
|
|
be the correct offset to the enclosed object
|
|
|
|
|
RTYPE is the type, and XFULL, XTOP, and XUSING_ENC are the other
|
|
|
|
|
parameters, computed by value_rtti_type(). If these are available,
|
|
|
|
|
they can be supplied and a second call to value_rtti_type() is avoided.
|
|
|
|
|
(Pass RTYPE == NULL if they're not available */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_full_object (struct value *argp, struct type *rtype, int xfull, int xtop,
|
2000-07-30 03:48:28 +02:00
|
|
|
|
int xusing_enc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *real_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int full = 0;
|
|
|
|
|
int top = -1;
|
|
|
|
|
int using_enc = 0;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *new_val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (rtype)
|
|
|
|
|
{
|
|
|
|
|
real_type = rtype;
|
|
|
|
|
full = xfull;
|
|
|
|
|
top = xtop;
|
|
|
|
|
using_enc = xusing_enc;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
real_type = value_rtti_type (argp, &full, &top, &using_enc);
|
|
|
|
|
|
|
|
|
|
/* If no RTTI data, or if object is already complete, do nothing */
|
|
|
|
|
if (!real_type || real_type == VALUE_ENCLOSING_TYPE (argp))
|
|
|
|
|
return argp;
|
|
|
|
|
|
|
|
|
|
/* If we have the full object, but for some reason the enclosing
|
1999-07-07 22:19:36 +02:00
|
|
|
|
type is wrong, set it *//* pai: FIXME -- sounds iffy */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (full)
|
|
|
|
|
{
|
2001-05-19 17:20:14 +02:00
|
|
|
|
argp = value_change_enclosing_type (argp, real_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return argp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if object is in memory */
|
|
|
|
|
if (VALUE_LVAL (argp) != lval_memory)
|
|
|
|
|
{
|
|
|
|
|
warning ("Couldn't retrieve complete object of RTTI type %s; object may be in register(s).", TYPE_NAME (real_type));
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return argp;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* All other cases -- retrieve the complete object */
|
|
|
|
|
/* Go back by the computed top_offset from the beginning of the object,
|
|
|
|
|
adjusting for the embedded offset of argp if that's what value_rtti_type
|
|
|
|
|
used for its computation. */
|
|
|
|
|
new_val = value_at_lazy (real_type, VALUE_ADDRESS (argp) - top +
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(using_enc ? 0 : VALUE_EMBEDDED_OFFSET (argp)),
|
|
|
|
|
VALUE_BFD_SECTION (argp));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
VALUE_TYPE (new_val) = VALUE_TYPE (argp);
|
|
|
|
|
VALUE_EMBEDDED_OFFSET (new_val) = using_enc ? top + VALUE_EMBEDDED_OFFSET (argp) : top;
|
|
|
|
|
return new_val;
|
|
|
|
|
}
|
|
|
|
|
|
2002-09-19 05:58:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-10-14 04:02:42 +02:00
|
|
|
|
/* Return the value of the local variable, if one exists.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Flag COMPLAIN signals an error if the request is made in an
|
|
|
|
|
inappropriate context. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
2002-10-14 04:02:42 +02:00
|
|
|
|
value_of_local (const char *name, int complain)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct symbol *func, *sym;
|
|
|
|
|
struct block *b;
|
2002-10-14 04:02:42 +02:00
|
|
|
|
struct value * ret;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (deprecated_selected_frame == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (complain)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
error ("no frame selected");
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
func = get_frame_function (deprecated_selected_frame);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!func)
|
|
|
|
|
{
|
|
|
|
|
if (complain)
|
2002-10-23 23:33:07 +02:00
|
|
|
|
error ("no `%s' in nameless context", name);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
else
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
b = SYMBOL_BLOCK_VALUE (func);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
if (dict_empty (BLOCK_DICT (b)))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (complain)
|
2002-10-23 23:33:07 +02:00
|
|
|
|
error ("no args, no `%s'", name);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
else
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calling lookup_block_symbol is necessary to get the LOC_REGISTER
|
|
|
|
|
symbol instead of the LOC_ARG one (if both exist). */
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
sym = lookup_block_symbol (b, name, NULL, VAR_DOMAIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (sym == NULL)
|
|
|
|
|
{
|
|
|
|
|
if (complain)
|
2002-10-23 23:33:07 +02:00
|
|
|
|
error ("current stack frame does not contain a variable named `%s'", name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
ret = read_var_value (sym, deprecated_selected_frame);
|
2002-10-14 04:02:42 +02:00
|
|
|
|
if (ret == 0 && complain)
|
2002-10-23 23:33:07 +02:00
|
|
|
|
error ("`%s' argument unreadable", name);
|
2002-10-14 04:02:42 +02:00
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* C++/Objective-C: return the value of the class instance variable,
|
|
|
|
|
if one exists. Flag COMPLAIN signals an error if the request is
|
|
|
|
|
made in an inappropriate context. */
|
|
|
|
|
|
|
|
|
|
struct value *
|
|
|
|
|
value_of_this (int complain)
|
|
|
|
|
{
|
|
|
|
|
if (current_language->la_language == language_objc)
|
|
|
|
|
return value_of_local ("self", complain);
|
|
|
|
|
else
|
|
|
|
|
return value_of_local ("this", complain);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a slice (sub-string, sub-array) of ARRAY, that is LENGTH elements
|
|
|
|
|
long, starting at LOWBOUND. The result has the same lower bound as
|
|
|
|
|
the original ARRAY. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_slice (struct value *array, int lowbound, int length)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *slice_range_type, *slice_type, *range_type;
|
2002-11-22 17:32:45 +01:00
|
|
|
|
LONGEST lowerbound, upperbound;
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *slice;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *array_type;
|
|
|
|
|
array_type = check_typedef (VALUE_TYPE (array));
|
|
|
|
|
COERCE_VARYING_ARRAY (array, array_type);
|
|
|
|
|
if (TYPE_CODE (array_type) != TYPE_CODE_ARRAY
|
|
|
|
|
&& TYPE_CODE (array_type) != TYPE_CODE_STRING
|
|
|
|
|
&& TYPE_CODE (array_type) != TYPE_CODE_BITSTRING)
|
|
|
|
|
error ("cannot take slice of non-array");
|
|
|
|
|
range_type = TYPE_INDEX_TYPE (array_type);
|
|
|
|
|
if (get_discrete_bounds (range_type, &lowerbound, &upperbound) < 0)
|
|
|
|
|
error ("slice from bad array or bitstring");
|
|
|
|
|
if (lowbound < lowerbound || length < 0
|
2002-08-01 Andrew Cagney <cagney@redhat.com>
* NEWS: Menion that CHILL has been made obsolete.
* gdbtypes.c (chill_varying_type): Make chill references obsolete.
* gdbserver/Makefile.in: Ditto.
* stabsread.c (read_range_type): Ditto.
* gdbtypes.h: Ditto.
* language.c (binop_type_check): Ditto.
(binop_result_type): Ditto.
(integral_type): Ditto.
(character_type): Ditto.
(string_type): Ditto.
(boolean_type): Ditto.
(structured_type): Ditto.
(lang_bool_type): Ditto.
(binop_type_check): Ditto.
* language.h (_LANG_chill): Ditto.
* dwarfread.c (set_cu_language): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
* dwarfread.c (handle_producer): Ditto.
* expression.h (enum exp_opcode): Ditto.
* eval.c: Ditto for comments.
* typeprint.c (typedef_print) [_LANG_chill]: Ditto.
* expprint.c (print_subexp): Ditto.
(print_subexp): Ditto.
* valops.c (value_cast): Ditto.
(search_struct_field): Ditto.
* value.h (COERCE_VARYING_ARRAY): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* valarith.c (value_binop): Ditto.
(value_neg): Ditto.
* valops.c (value_slice): Ditto.
* symtab.h (union language_specific): Ditto.
(SYMBOL_INIT_LANGUAGE_SPECIFIC): Ditto.
(SYMBOL_DEMANGLED_NAME): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* defs.h (enum language): Ditto.
* symtab.c (got_symtab): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* ch-typeprint.c: Make file obsolete.
* ch-valprint.c: Make file obsolete.
* ch-lang.h: Make file obsolete.
* ch-exp.c: Make file obsolete.
* ch-lang.c: Make file obsolete.
* Makefile.in (FLAGS_TO_PASS): Do not pass CHILL or CHILLFLAGS or
CHILL_LIB.
(TARGET_FLAGS_TO_PASS): Ditto.
(CHILLFLAGS): Obsolete.
(CHILL): Obsolete.
(CHILL_FOR_TARGET): Obsolete.
(CHILL_LIB): Obsolete.
(SFILES): Remove ch-exp.c, ch-lang.c, ch-typeprint.c and
ch-valprint.c.
(HFILES_NO_SRCDIR): Remove ch-lang.h.
(COMMON_OBS): Remove ch-valprint.o, ch-typeprint.o, ch-exp.o and
ch-lang.o.
(ch-exp.o, ch-lang.o, ch-typeprint.o, ch-valprint.o): Delete
targets.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* stabs.texinfo, gdb.texinfo, gdbint.texinfo: Obsolete references
to CHILL.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,
CHILL_FOR_TARGET and CHILL_LIB.
* configure.in (configdirs): Remove gdb.chill.
* configure: Regenerate.
* lib/gdb.exp: Obsolete references to chill.
* gdb.fortran/types.exp: Ditto.
* gdb.fortran/exprs.exp: Ditto.
2002-08-01 19:18:35 +02:00
|
|
|
|
|| lowbound + length - 1 > upperbound)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("slice out of range");
|
|
|
|
|
/* FIXME-type-allocation: need a way to free this type when we are
|
|
|
|
|
done with it. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
slice_range_type = create_range_type ((struct type *) NULL,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
TYPE_TARGET_TYPE (range_type),
|
|
|
|
|
lowbound, lowbound + length - 1);
|
|
|
|
|
if (TYPE_CODE (array_type) == TYPE_CODE_BITSTRING)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
slice_type = create_set_type ((struct type *) NULL, slice_range_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
TYPE_CODE (slice_type) = TYPE_CODE_BITSTRING;
|
|
|
|
|
slice = value_zero (slice_type, not_lval);
|
|
|
|
|
for (i = 0; i < length; i++)
|
|
|
|
|
{
|
|
|
|
|
int element = value_bit_index (array_type,
|
|
|
|
|
VALUE_CONTENTS (array),
|
|
|
|
|
lowbound + i);
|
|
|
|
|
if (element < 0)
|
|
|
|
|
error ("internal error accessing bitstring");
|
|
|
|
|
else if (element > 0)
|
|
|
|
|
{
|
|
|
|
|
int j = i % TARGET_CHAR_BIT;
|
|
|
|
|
if (BITS_BIG_ENDIAN)
|
|
|
|
|
j = TARGET_CHAR_BIT - 1 - j;
|
|
|
|
|
VALUE_CONTENTS_RAW (slice)[i / TARGET_CHAR_BIT] |= (1 << j);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* We should set the address, bitssize, and bitspos, so the clice
|
2000-03-13 08:30:00 +01:00
|
|
|
|
can be used on the LHS, but that may require extensions to
|
|
|
|
|
value_assign. For now, just leave as a non_lval. FIXME. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct type *element_type = TYPE_TARGET_TYPE (array_type);
|
2002-11-22 17:32:45 +01:00
|
|
|
|
LONGEST offset
|
1999-04-16 03:35:26 +02:00
|
|
|
|
= (lowbound - lowerbound) * TYPE_LENGTH (check_typedef (element_type));
|
1999-07-07 22:19:36 +02:00
|
|
|
|
slice_type = create_array_type ((struct type *) NULL, element_type,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
slice_range_type);
|
|
|
|
|
TYPE_CODE (slice_type) = TYPE_CODE (array_type);
|
|
|
|
|
slice = allocate_value (slice_type);
|
|
|
|
|
if (VALUE_LAZY (array))
|
|
|
|
|
VALUE_LAZY (slice) = 1;
|
|
|
|
|
else
|
|
|
|
|
memcpy (VALUE_CONTENTS (slice), VALUE_CONTENTS (array) + offset,
|
|
|
|
|
TYPE_LENGTH (slice_type));
|
|
|
|
|
if (VALUE_LVAL (array) == lval_internalvar)
|
|
|
|
|
VALUE_LVAL (slice) = lval_internalvar_component;
|
|
|
|
|
else
|
|
|
|
|
VALUE_LVAL (slice) = VALUE_LVAL (array);
|
|
|
|
|
VALUE_ADDRESS (slice) = VALUE_ADDRESS (array);
|
|
|
|
|
VALUE_OFFSET (slice) = VALUE_OFFSET (array) + offset;
|
|
|
|
|
}
|
|
|
|
|
return slice;
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-04 06:53:50 +02:00
|
|
|
|
/* Create a value for a FORTRAN complex number. Currently most of
|
|
|
|
|
the time values are coerced to COMPLEX*16 (i.e. a complex number
|
|
|
|
|
composed of 2 doubles. This really should be a smarter routine
|
|
|
|
|
that figures out precision inteligently as opposed to assuming
|
1999-07-07 22:19:36 +02:00
|
|
|
|
doubles. FIXME: fmb */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *
|
|
|
|
|
value_literal_complex (struct value *arg1, struct value *arg2, struct type *type)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *real_type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
|
|
|
|
|
val = allocate_value (type);
|
|
|
|
|
arg1 = value_cast (real_type, arg1);
|
|
|
|
|
arg2 = value_cast (real_type, arg2);
|
|
|
|
|
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (val),
|
|
|
|
|
VALUE_CONTENTS (arg1), TYPE_LENGTH (real_type));
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (val) + TYPE_LENGTH (real_type),
|
|
|
|
|
VALUE_CONTENTS (arg2), TYPE_LENGTH (real_type));
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Cast a value into the appropriate complex data type. */
|
|
|
|
|
|
2002-01-04 06:20:09 +01:00
|
|
|
|
static struct value *
|
|
|
|
|
cast_into_complex (struct type *type, struct value *val)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *real_type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_COMPLEX)
|
|
|
|
|
{
|
|
|
|
|
struct type *val_real_type = TYPE_TARGET_TYPE (VALUE_TYPE (val));
|
2002-01-04 06:20:09 +01:00
|
|
|
|
struct value *re_val = allocate_value (val_real_type);
|
|
|
|
|
struct value *im_val = allocate_value (val_real_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (re_val),
|
|
|
|
|
VALUE_CONTENTS (val), TYPE_LENGTH (val_real_type));
|
|
|
|
|
memcpy (VALUE_CONTENTS_RAW (im_val),
|
|
|
|
|
VALUE_CONTENTS (val) + TYPE_LENGTH (val_real_type),
|
1999-07-07 22:19:36 +02:00
|
|
|
|
TYPE_LENGTH (val_real_type));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
return value_literal_complex (re_val, im_val, type);
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_FLT
|
|
|
|
|
|| TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_INT)
|
|
|
|
|
return value_literal_complex (val, value_zero (real_type, not_lval), type);
|
|
|
|
|
else
|
|
|
|
|
error ("cannot cast non-number to complex");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
_initialize_valops (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
#if 0
|
|
|
|
|
add_show_from_set
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(add_set_cmd ("abandon", class_support, var_boolean, (char *) &auto_abandon,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
"Set automatic abandonment of expressions upon failure.",
|
|
|
|
|
&setlist),
|
|
|
|
|
&showlist);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
add_show_from_set
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(add_set_cmd ("overload-resolution", class_support, var_boolean, (char *) &overload_resolution,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
"Set overload resolution in evaluating C++ functions.",
|
|
|
|
|
&setlist),
|
|
|
|
|
&showlist);
|
|
|
|
|
overload_resolution = 1;
|
|
|
|
|
}
|