X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-abi.c;h=fd967c3096b8df844180316b15f9680e430fe2e0;hb=21af24c8371a3e040f6f548ddfafb20114442c28;hp=02b64a38100ce094c3151fa6380bde4e6528fada;hpb=7b6bb8daaceb9ecf3f42dea57ae82733d6a3b2f6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 02b64a3810..fd967c3096 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -1,7 +1,6 @@ /* Generic code for supporting multiple C++ ABI's - Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -22,12 +21,8 @@ #include "value.h" #include "cp-abi.h" #include "command.h" -#include "exceptions.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 }; @@ -70,14 +65,31 @@ is_operator_name (const char *name) } int -baseclass_offset (struct type *type, int index, - const bfd_byte *valaddr, - CORE_ADDR address) +baseclass_offset (struct type *type, int index, const gdb_byte *valaddr, + LONGEST embedded_offset, CORE_ADDR address, + const struct value *val) { - 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); + int res = 0; + + gdb_assert (current_cp_abi.baseclass_offset != NULL); + + try + { + res = (*current_cp_abi.baseclass_offset) (type, index, valaddr, + embedded_offset, + address, val); + } + catch (const gdb_exception_error &ex) + { + if (ex.error != NOT_AVAILABLE_ERROR) + throw; + + throw_error (NOT_AVAILABLE_ERROR, + _("Cannot determine virtual baseclass offset " + "of incomplete object")); + } + + return res; } struct value * @@ -93,19 +105,22 @@ value_virtual_fn_field (struct value **arg1p, struct type * value_rtti_type (struct value *v, int *full, - int *top, int *using_enc) + LONGEST *top, int *using_enc) { struct type *ret = NULL; - struct gdb_exception e; - if ((current_cp_abi.rtti_type) == NULL) + if ((current_cp_abi.rtti_type) == NULL + || !HAVE_CPLUS_STRUCT (check_typedef (value_type (v)))) return NULL; - TRY_CATCH (e, RETURN_MASK_ERROR) + try { ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc); } - if (e.reason < 0) - return NULL; + catch (const gdb_exception_error &e) + { + return NULL; + } + return ret; } @@ -154,11 +169,64 @@ cplus_method_ptr_to_value (struct value **this_p, return (*current_cp_abi.method_ptr_to_value) (this_p, method_ptr); } -int +/* See cp-abi.h. */ + +void +cplus_print_vtable (struct value *value) +{ + if (current_cp_abi.print_vtable == NULL) + error (_("GDB cannot print the vtable on this target")); + (*current_cp_abi.print_vtable) (value); +} + +/* See cp-abi.h. */ + +struct value * +cplus_typeid (struct value *value) +{ + if (current_cp_abi.get_typeid == NULL) + error (_("GDB cannot find the typeid on this target")); + return (*current_cp_abi.get_typeid) (value); +} + +/* See cp-abi.h. */ + +struct type * +cplus_typeid_type (struct gdbarch *gdbarch) +{ + if (current_cp_abi.get_typeid_type == NULL) + error (_("GDB cannot find the type for 'typeid' on this target")); + return (*current_cp_abi.get_typeid_type) (gdbarch); +} + +/* See cp-abi.h. */ + +struct type * +cplus_type_from_type_info (struct value *value) +{ + if (current_cp_abi.get_type_from_type_info == NULL) + error (_("GDB cannot find the type from a std::type_info on this target")); + return (*current_cp_abi.get_type_from_type_info) (value); +} + +/* See cp-abi.h. */ + +std::string +cplus_typename_from_type_info (struct value *value) +{ + if (current_cp_abi.get_typename_from_type_info == NULL) + error (_("GDB cannot find the type name " + "from a std::type_info on this target")); + return (*current_cp_abi.get_typename_from_type_info) (value); +} + +/* See cp-abi.h. */ + +struct language_pass_by_ref_info cp_pass_by_reference (struct type *type) { if ((current_cp_abi.pass_by_reference) == NULL) - return 0; + return default_pass_by_reference (type); return (*current_cp_abi.pass_by_reference) (type); } @@ -184,7 +252,8 @@ 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")); + _("Too many C++ ABIs, please increase " + "CP_ABI_MAX in cp-abi.c")); cp_abis[num_cp_abis++] = abi; @@ -245,37 +314,35 @@ find_cp_abi (const char *short_name) static void list_cp_abis (int from_tty) { - struct cleanup *cleanup_chain; + struct ui_out *uiout = current_uiout; 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"); + uiout->text ("The available C++ ABIs are:\n"); + ui_out_emit_tuple tuple_emitter (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); + uiout->text (" "); + uiout->field_string ("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); + uiout->text (pad); - ui_out_field_string (uiout, "doc", cp_abis[i]->doc); - ui_out_text (uiout, "\n"); + uiout->field_string ("doc", cp_abis[i]->doc); + uiout->text ("\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) +set_cp_abi_cmd (const char *args, int from_tty) { if (args == NULL) { @@ -287,31 +354,56 @@ set_cp_abi_cmd (char *args, int from_tty) error (_("Could not find \"%s\" in ABI list"), args); } -/* Show the currently selected C++ ABI. */ +/* A completion function for "set cp-abi". */ static void -show_cp_abi_cmd (char *args, int from_tty) +cp_abi_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) { - ui_out_text (uiout, "The currently selected C++ ABI is \""); + static const char **cp_abi_names; + + if (cp_abi_names == NULL) + { + int i; - 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"); + cp_abi_names = XNEWVEC (const char *, num_cp_abis + 1); + for (i = 0; i < num_cp_abis; ++i) + cp_abi_names[i] = cp_abis[i]->shortname; + cp_abi_names[i] = NULL; + } + + complete_on_enum (tracker, cp_abi_names, text, word); } -extern initialize_file_ftype _initialize_cp_abi; /* -Wmissing-prototypes */ +/* Show the currently selected C++ ABI. */ + +static void +show_cp_abi_cmd (const char *args, int from_tty) +{ + struct ui_out *uiout = current_uiout; + + uiout->text ("The currently selected C++ ABI is \""); + + uiout->field_string ("cp-abi", current_cp_abi.shortname); + uiout->text ("\" ("); + uiout->field_string ("longname", current_cp_abi.longname); + uiout->text (").\n"); +} void _initialize_cp_abi (void) { + struct cmd_list_element *c; + register_cp_abi (&auto_cp_abi); switch_to_cp_abi ("auto"); - add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\ + c = 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); + &setlist); + set_cmd_completer (c, cp_abi_completer); add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd, _("Show the ABI used for inspecting C++ objects."),