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().
283 lines
7.6 KiB
C
283 lines
7.6 KiB
C
/* Generic code for supporting multiple C++ ABI's
|
|
|
|
Copyright (C) 2001, 2002, 2003, 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. */
|
|
|
|
#include "defs.h"
|
|
#include "value.h"
|
|
#include "cp-abi.h"
|
|
#include "command.h"
|
|
#include "gdbcmd.h"
|
|
#include "ui-out.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
static struct cp_abi_ops *find_cp_abi (const char *short_name);
|
|
|
|
static struct cp_abi_ops current_cp_abi = { "", NULL };
|
|
static struct cp_abi_ops auto_cp_abi = { "auto", NULL };
|
|
|
|
#define CP_ABI_MAX 8
|
|
static struct cp_abi_ops *cp_abis[CP_ABI_MAX];
|
|
static int num_cp_abis = 0;
|
|
|
|
enum ctor_kinds
|
|
is_constructor_name (const char *name)
|
|
{
|
|
if ((current_cp_abi.is_constructor_name) == NULL)
|
|
error (_("ABI doesn't define required function is_constructor_name"));
|
|
return (*current_cp_abi.is_constructor_name) (name);
|
|
}
|
|
|
|
enum dtor_kinds
|
|
is_destructor_name (const char *name)
|
|
{
|
|
if ((current_cp_abi.is_destructor_name) == NULL)
|
|
error (_("ABI doesn't define required function is_destructor_name"));
|
|
return (*current_cp_abi.is_destructor_name) (name);
|
|
}
|
|
|
|
int
|
|
is_vtable_name (const char *name)
|
|
{
|
|
if ((current_cp_abi.is_vtable_name) == NULL)
|
|
error (_("ABI doesn't define required function is_vtable_name"));
|
|
return (*current_cp_abi.is_vtable_name) (name);
|
|
}
|
|
|
|
int
|
|
is_operator_name (const char *name)
|
|
{
|
|
if ((current_cp_abi.is_operator_name) == NULL)
|
|
error (_("ABI doesn't define required function is_operator_name"));
|
|
return (*current_cp_abi.is_operator_name) (name);
|
|
}
|
|
|
|
int
|
|
baseclass_offset (struct type *type, int index, const bfd_byte *valaddr,
|
|
CORE_ADDR address)
|
|
{
|
|
if (current_cp_abi.baseclass_offset == NULL)
|
|
error (_("ABI doesn't define required function baseclass_offset"));
|
|
return (*current_cp_abi.baseclass_offset) (type, index, valaddr, address);
|
|
}
|
|
|
|
struct value *
|
|
value_virtual_fn_field (struct value **arg1p, struct fn_field *f, int j,
|
|
struct type *type, int offset)
|
|
{
|
|
if ((current_cp_abi.virtual_fn_field) == NULL)
|
|
return NULL;
|
|
return (*current_cp_abi.virtual_fn_field) (arg1p, f, j, type, offset);
|
|
}
|
|
|
|
struct type *
|
|
value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
|
|
{
|
|
if ((current_cp_abi.rtti_type) == NULL)
|
|
return NULL;
|
|
return (*current_cp_abi.rtti_type) (v, full, top, using_enc);
|
|
}
|
|
|
|
void
|
|
cplus_print_method_ptr (const gdb_byte *contents, struct type *type,
|
|
struct ui_file *stream)
|
|
{
|
|
if (current_cp_abi.print_method_ptr == NULL)
|
|
error (_("GDB does not support pointers to methods on this target"));
|
|
(*current_cp_abi.print_method_ptr) (contents, type, stream);
|
|
}
|
|
|
|
int
|
|
cplus_method_ptr_size (void)
|
|
{
|
|
if (current_cp_abi.method_ptr_size == NULL)
|
|
error (_("GDB does not support pointers to methods on this target"));
|
|
return (*current_cp_abi.method_ptr_size) ();
|
|
}
|
|
|
|
void
|
|
cplus_make_method_ptr (gdb_byte *contents, CORE_ADDR value, int is_virtual)
|
|
{
|
|
if (current_cp_abi.make_method_ptr == NULL)
|
|
error (_("GDB does not support pointers to methods on this target"));
|
|
(*current_cp_abi.make_method_ptr) (contents, value, is_virtual);
|
|
}
|
|
|
|
struct value *
|
|
cplus_method_ptr_to_value (struct value **this_p, struct value *method_ptr)
|
|
{
|
|
if (current_cp_abi.method_ptr_to_value == NULL)
|
|
error (_("GDB does not support pointers to methods on this target"));
|
|
return (*current_cp_abi.method_ptr_to_value) (this_p, method_ptr);
|
|
}
|
|
|
|
/* Set the current C++ ABI to SHORT_NAME. */
|
|
|
|
static int
|
|
switch_to_cp_abi (const char *short_name)
|
|
{
|
|
struct cp_abi_ops *abi;
|
|
|
|
abi = find_cp_abi (short_name);
|
|
if (abi == NULL)
|
|
return 0;
|
|
|
|
current_cp_abi = *abi;
|
|
return 1;
|
|
}
|
|
|
|
/* Add ABI to the list of supported C++ ABI's. */
|
|
|
|
int
|
|
register_cp_abi (struct cp_abi_ops *abi)
|
|
{
|
|
if (num_cp_abis == CP_ABI_MAX)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c"));
|
|
|
|
cp_abis[num_cp_abis++] = abi;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Set the ABI to use in "auto" mode to SHORT_NAME. */
|
|
|
|
void
|
|
set_cp_abi_as_auto_default (const char *short_name)
|
|
{
|
|
char *new_longname, *new_doc;
|
|
struct cp_abi_ops *abi = find_cp_abi (short_name);
|
|
|
|
if (abi == NULL)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("Cannot find C++ ABI \"%s\" to set it as auto default."),
|
|
short_name);
|
|
|
|
if (auto_cp_abi.longname != NULL)
|
|
xfree ((char *) auto_cp_abi.longname);
|
|
if (auto_cp_abi.doc != NULL)
|
|
xfree ((char *) auto_cp_abi.doc);
|
|
|
|
auto_cp_abi = *abi;
|
|
|
|
auto_cp_abi.shortname = "auto";
|
|
xasprintf (&new_longname, "currently \"%s\"", abi->shortname);
|
|
auto_cp_abi.longname = new_longname;
|
|
|
|
xasprintf (&new_doc, "Automatically selected; currently \"%s\"",
|
|
abi->shortname);
|
|
auto_cp_abi.doc = new_doc;
|
|
|
|
/* Since we copy the current ABI into current_cp_abi instead of
|
|
using a pointer, if auto is currently the default, we need to
|
|
reset it. */
|
|
if (strcmp (current_cp_abi.shortname, "auto") == 0)
|
|
switch_to_cp_abi ("auto");
|
|
}
|
|
|
|
/* Return the ABI operations associated with SHORT_NAME. */
|
|
|
|
static struct cp_abi_ops *
|
|
find_cp_abi (const char *short_name)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < num_cp_abis; i++)
|
|
if (strcmp (cp_abis[i]->shortname, short_name) == 0)
|
|
return cp_abis[i];
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Display the list of registered C++ ABIs. */
|
|
|
|
static void
|
|
list_cp_abis (int from_tty)
|
|
{
|
|
struct cleanup *cleanup_chain;
|
|
int i;
|
|
ui_out_text (uiout, "The available C++ ABIs are:\n");
|
|
|
|
cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "cp-abi-list");
|
|
for (i = 0; i < num_cp_abis; i++)
|
|
{
|
|
char pad[14];
|
|
int padcount;
|
|
|
|
ui_out_text (uiout, " ");
|
|
ui_out_field_string (uiout, "cp-abi", cp_abis[i]->shortname);
|
|
|
|
padcount = 16 - 2 - strlen (cp_abis[i]->shortname);
|
|
pad[padcount] = 0;
|
|
while (padcount > 0)
|
|
pad[--padcount] = ' ';
|
|
ui_out_text (uiout, pad);
|
|
|
|
ui_out_field_string (uiout, "doc", cp_abis[i]->doc);
|
|
ui_out_text (uiout, "\n");
|
|
}
|
|
do_cleanups (cleanup_chain);
|
|
}
|
|
|
|
/* Set the current C++ ABI, or display the list of options if no
|
|
argument is given. */
|
|
|
|
static void
|
|
set_cp_abi_cmd (char *args, int from_tty)
|
|
{
|
|
if (args == NULL)
|
|
{
|
|
list_cp_abis (from_tty);
|
|
return;
|
|
}
|
|
|
|
if (!switch_to_cp_abi (args))
|
|
error (_("Could not find \"%s\" in ABI list"), args);
|
|
}
|
|
|
|
/* Show the currently selected C++ ABI. */
|
|
|
|
static void
|
|
show_cp_abi_cmd (char *args, int from_tty)
|
|
{
|
|
ui_out_text (uiout, "The currently selected C++ ABI is \"");
|
|
|
|
ui_out_field_string (uiout, "cp-abi", current_cp_abi.shortname);
|
|
ui_out_text (uiout, "\" (");
|
|
ui_out_field_string (uiout, "longname", current_cp_abi.longname);
|
|
ui_out_text (uiout, ").\n");
|
|
}
|
|
|
|
extern initialize_file_ftype _initialize_cp_abi; /* -Wmissing-prototypes */
|
|
|
|
void
|
|
_initialize_cp_abi (void)
|
|
{
|
|
register_cp_abi (&auto_cp_abi);
|
|
switch_to_cp_abi ("auto");
|
|
|
|
add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\
|
|
Set the ABI used for inspecting C++ objects.\n\
|
|
\"set cp-abi\" with no arguments will list the available ABIs."),
|
|
&setlist);
|
|
|
|
add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
|
|
_("Show the ABI used for inspecting C++ objects."), &showlist);
|
|
}
|