0d5de0100f
* Makefile.in (gnu-v3-abi.o): Delete special rule. (eval.o, gnu-v3-abi.o, ia64-tdep.o): Update. * ada-valprint.c (ada_print_scalar): Update for new type codes. * c-typeprint.c (c_print_type): Update for new type codes. (c_type_print_varspec_prefix, c_type_print_varspec_suffix) (c_type_print_base): Likewise. (c_type_print_args): Rewrite. * c-valprint.c (c_val_print): Update for new type codes. Remove support for references to members. Treat methods like functions. * cp-abi.c (cplus_print_method_ptr, cplus_method_ptr_size) (cplus_make_method_ptr, cplus_method_ptr_to_value): New. * cp-abi.h (cplus_print_method_ptr, cplus_method_ptr_size) (cplus_make_method_ptr, cplus_method_ptr_to_value): New prototypes. (struct cp_abi_ops): Add corresponding members. * cp-valprint.c (cp_print_class_method): Delete. (cp_find_class_member): New function. (cp_print_class_member): Use it. Simplify support for bogus member pointers. * dwarf2read.c (quirk_gcc_member_function_pointer): Use lookup_methodptr_type. (read_tag_ptr_to_member_type): Likewise, and lookup_memberptr_type. * eval.c (evaluate_subexp_standard): Implement EVAL_SKIP for OP_SCOPE. Update call to value_aggregate_elt. Rewrite member pointer support. (evaluate_subexp_for_address): Handle OP_SCOPE explicitly. Handle references returned by user defined operators. * f-typeprint.c (f_print_type, f_type_print_varspec_prefix) (f_type_print_varspec_suffix): Remove support for member pointers. * gdbtypes.c (lookup_memberptr_type): Renamed from lookup_member_type and adjusted. (smash_to_memberptr_type): Likewise, from smash_to_member_type. (lookup_methodptr_type): New. (rank_one_type): Adjust for TYPE_CODE_MEMBERPTR. (recursive_dump_type): Update for new types. * gdbtypes.h (enum type_code): Replace TYPE_CODE_MEMBER with TYPE_CODE_MEMBERPTR and TYPE_CODE_METHODPTR. (lookup_memberptr_type, lookup_methodptr_type) (smash_to_memberptr_type): New prototypes. (smash_to_method_type): Formatting fix. (lookup_member_type, smash_to_member_type): Delete prototypes. * gnu-v3-abi.c (gnuv3_get_vtable, gnuv3_get_virtual_fn): New. Do not rely on debug information for the vptr or the method's enclosing type. Handle function descriptors for IA64. (gnuv3_virtual_fn_field): Rewrite using the new functions. (gnuv3_find_method_in, gnuv3_print_method_ptr) (gnuv3_method_ptr_size, gnuv3_make_method_ptr) (gnuv3_method_ptr_to_value): New. (init_gnuv3_ops): Set new members of gnu_v3_abi_ops. * hpread.c (hpread_type_lookup): Update for new types. * infcall.c (value_arg_coerce): Likewise. * m2-typeprint.c (m2_print_type): Remove explicit support for member pointers. * m2-valprint.c (m2_val_print): Likewise. * p-typeprint.c (pascal_type_print_varspec_prefix) (pascal_type_print_varspec_suffix, pascal_type_print_base): Likewise. * p-valprint.c (pascal_val_print): Likewise. (pascal_object_print_class_method, pascal_object_print_class_member): Delete. * p-lang.h (pascal_object_print_class_method) (pascal_object_print_class_member): Delete prototypes. * stabsread.c (read_type): Update for new types. * typeprint.c (print_type_scalar): Likewise. * valops.c (value_struct_elt_for_reference, value_namespace_elt) (value_maybe_namespace_elt, value_aggregate_elt): Add want_address argument. Construct a pointer to member if the address of a function or data member is requested. (value_cast_pointers): Don't modify the input value. (value_cast): Adjust pointer to member handling for new types. Allow null pointer to member constants. Don't modify the input value. (value_ind): Remove pointer to member check. Handle function descriptors for function pointers. (value_struct_elt, value_find_oload_method_list, check_field): Remove pointer to member checks. * value.c (unpack_long): Allow pointers to data members. (value_from_longest): Allow member pointers. * value.h (value_aggregate_elt): Add want_address. * varobj.c (c_variable_editable): Remove check for members. * gdbarch.sh: Add vtable_function_descriptors and vbit_in_delta. * ia64-tdep.c (ia64_convert_from_func_ptr_addr): Handle descriptors in virtual tables. (ia64_gdbarch_init): Call set_gdbarch_vtable_function_descriptors. * c-lang.h (cp_print_class_method): Delete prototype. * arm-tdep.c (arm_gdbarch_init): Call set_gdbarch_vbit_in_delta. * mips-tdep.c (mips_gdbarch_init): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * gdb.cp/classes.exp (test_pointers_to_class_members): Update expected output. Test the types of members and member pointers. * gdb.cp/inherit.exp (test_print_mi_member_types): Remove KFAILs for gdb/2092. * gdb.cp/member-ptr.exp: Search for a comment instead of a statement. Enable for GCC. Update expected output for some tests and add new tests. Remove obsolete GCC KFAILs. Allow GCC's class layout. * gdb.cp/member-ptr.cc (Padding, Padding::vspacer, Base, Base::get_x) (Base::vget_base, Left, Left::vget, Right, Right::vget, Diamond) (Diamond::vget_base): New. (main): Add new tests. * gdb.cp/printmethod.exp: Update expected output for member functions. * gdb.cp/virtfunc.exp (test_virtual_calls): Add a KFAIL for print pEe->D::vg().
202 lines
7.5 KiB
C
202 lines
7.5 KiB
C
/* Abstraction of various C++ ABI's we support, and the info we need
|
|
to get from them.
|
|
|
|
Contributed by Daniel Berlin <dberlin@redhat.com>
|
|
|
|
Copyright (C) 2001, 2005, 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify
|
|
it under the terms of the GNU General Public License as published
|
|
by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#ifndef CP_ABI_H_
|
|
#define CP_ABI_H_ 1
|
|
|
|
struct fn_field;
|
|
struct type;
|
|
struct value;
|
|
struct ui_file;
|
|
|
|
/* The functions here that attempt to determine what sort of thing a
|
|
mangled name refers to may well be revised in the future. It would
|
|
certainly be cleaner to carry this information explicitly in GDB's
|
|
data structures than to derive it from the mangled name. */
|
|
|
|
|
|
/* Kinds of constructors. All these values are guaranteed to be
|
|
non-zero. */
|
|
enum ctor_kinds {
|
|
|
|
/* Initialize a complete object, including virtual bases, using
|
|
memory provided by caller. */
|
|
complete_object_ctor = 1,
|
|
|
|
/* Initialize a base object of some larger object. */
|
|
base_object_ctor,
|
|
|
|
/* An allocating complete-object constructor. */
|
|
complete_object_allocating_ctor
|
|
};
|
|
|
|
/* Return non-zero iff NAME is the mangled name of a constructor.
|
|
Actually, return an `enum ctor_kind' value describing what *kind*
|
|
of constructor it is. */
|
|
extern enum ctor_kinds is_constructor_name (const char *name);
|
|
|
|
|
|
/* Kinds of destructors. All these values are guaranteed to be
|
|
non-zero. */
|
|
enum dtor_kinds {
|
|
|
|
/* A destructor which finalizes the entire object, and then calls
|
|
`delete' on its storage. */
|
|
deleting_dtor = 1,
|
|
|
|
/* A destructor which finalizes the entire object, but does not call
|
|
`delete'. */
|
|
complete_object_dtor,
|
|
|
|
/* A destructor which finalizes a subobject of some larger object. */
|
|
base_object_dtor
|
|
};
|
|
|
|
/* Return non-zero iff NAME is the mangled name of a destructor.
|
|
Actually, return an `enum dtor_kind' value describing what *kind*
|
|
of destructor it is. */
|
|
extern enum dtor_kinds is_destructor_name (const char *name);
|
|
|
|
|
|
/* Return non-zero iff NAME is the mangled name of a vtable. */
|
|
extern int is_vtable_name (const char *name);
|
|
|
|
|
|
/* Return non-zero iff NAME is the un-mangled name of an operator,
|
|
perhaps scoped within some class. */
|
|
extern int is_operator_name (const char *name);
|
|
|
|
|
|
/* Return an object's virtual function as a value.
|
|
|
|
VALUEP is a pointer to a pointer to a value, holding the object
|
|
whose virtual function we want to invoke. If the ABI requires a
|
|
virtual function's caller to adjust the `this' pointer by an amount
|
|
retrieved from the vtable before invoking the function (i.e., we're
|
|
not using "vtable thunks" to do the adjustment automatically), then
|
|
this function may set *VALUEP to point to a new object with an
|
|
appropriately tweaked address.
|
|
|
|
The J'th element of the overload set F is the virtual function of
|
|
*VALUEP we want to invoke.
|
|
|
|
TYPE is the base type of *VALUEP whose method we're invoking ---
|
|
this is the type containing F. OFFSET is the offset of that base
|
|
type within *VALUEP. */
|
|
extern struct value *value_virtual_fn_field (struct value **valuep,
|
|
struct fn_field *f, int j,
|
|
struct type *type, int offset);
|
|
|
|
|
|
/* Try to find the run-time type of VALUE, using C++ run-time type
|
|
information. Return the run-time type, or zero if we can't figure
|
|
it out.
|
|
|
|
If we do find the run-time type:
|
|
- Set *FULL to non-zero if VALUE already contains the complete
|
|
run-time object, not just some embedded base class of the object.
|
|
- Set *TOP and *USING_ENC to indicate where the enclosing object
|
|
starts relative to VALUE:
|
|
- If *USING_ENC is zero, then *TOP is the offset from the start
|
|
of the complete object to the start of the embedded subobject
|
|
VALUE represents. In other words, the enclosing object starts
|
|
at VALUE_ADDR (VALUE) + VALUE_OFFSET (VALUE) +
|
|
value_embedded_offset (VALUE) + *TOP
|
|
- If *USING_ENC is non-zero, then *TOP is the offset from the
|
|
address of the complete object to the enclosing object stored
|
|
in VALUE. In other words, the enclosing object starts at
|
|
VALUE_ADDR (VALUE) + VALUE_OFFSET (VALUE) + *TOP.
|
|
If VALUE's type and enclosing type are the same, then these two
|
|
cases are equivalent.
|
|
|
|
FULL, TOP, and USING_ENC can each be zero, in which case we don't
|
|
provide the corresponding piece of information. */
|
|
extern struct type *value_rtti_type (struct value *value,
|
|
int *full, int *top, int *using_enc);
|
|
|
|
/* Compute the offset of the baseclass which is
|
|
the INDEXth baseclass of class TYPE,
|
|
for value at VALADDR (in host) at ADDRESS (in target).
|
|
The result is the offset of the baseclass value relative
|
|
to (the address of)(ARG) + OFFSET.
|
|
|
|
-1 is returned on error. */
|
|
|
|
extern int baseclass_offset (struct type *type, int index,
|
|
const bfd_byte *valaddr, CORE_ADDR address);
|
|
|
|
/* Describe the target of a pointer to method. CONTENTS is the byte
|
|
pattern representing the pointer to method. TYPE is the pointer to
|
|
method type. STREAM is the stream to print it to. */
|
|
void cplus_print_method_ptr (const gdb_byte *contents, struct type *type,
|
|
struct ui_file *stream);
|
|
|
|
/* Return the size of a pointer to member function for the current
|
|
architecture. */
|
|
int cplus_method_ptr_size (void);
|
|
|
|
/* Return the method which should be called by applying METHOD_PTR
|
|
to *THIS_P, and adjust *THIS_P if necessary. */
|
|
struct value *cplus_method_ptr_to_value (struct value **this_p,
|
|
struct value *method_ptr);
|
|
|
|
/* Create the byte pattern in CONTENTS representing a pointer to
|
|
member function at ADDRESS (if IS_VIRTUAL is 0) or with virtual
|
|
table offset ADDRESS (if IS_VIRTUAL is 1). This is the opposite
|
|
of cplus_method_ptr_to_value. */
|
|
void cplus_make_method_ptr (gdb_byte *CONTENTS, CORE_ADDR address,
|
|
int is_virtual);
|
|
|
|
struct cp_abi_ops
|
|
{
|
|
const char *shortname;
|
|
const char *longname;
|
|
const char *doc;
|
|
|
|
/* ABI-specific implementations for the functions declared above. */
|
|
enum ctor_kinds (*is_constructor_name) (const char *name);
|
|
enum dtor_kinds (*is_destructor_name) (const char *name);
|
|
int (*is_vtable_name) (const char *name);
|
|
int (*is_operator_name) (const char *name);
|
|
struct value *(*virtual_fn_field) (struct value **arg1p, struct fn_field * f,
|
|
int j, struct type * type, int offset);
|
|
struct type *(*rtti_type) (struct value *v, int *full, int *top,
|
|
int *using_enc);
|
|
int (*baseclass_offset) (struct type *type, int index,
|
|
const bfd_byte *valaddr, CORE_ADDR address);
|
|
void (*print_method_ptr) (const gdb_byte *contents, struct type *type,
|
|
struct ui_file *stream);
|
|
int (*method_ptr_size) (void);
|
|
void (*make_method_ptr) (gdb_byte *, CORE_ADDR, int);
|
|
struct value * (*method_ptr_to_value) (struct value **, struct value *);
|
|
};
|
|
|
|
|
|
extern int register_cp_abi (struct cp_abi_ops *abi);
|
|
extern void set_cp_abi_as_auto_default (const char *short_name);
|
|
|
|
#endif
|
|
|