X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-abi.c;h=bbb74d426382fa0662d8b78340e5dc51793fb51f;hb=488d02fe7729dda5b9414a3942df68e0c316ce53;hp=f2a96deda64765a228e122181ef46401641ed7d0;hpb=843e694d6a6dd64a1a3e95ba9f30bdeab8d1fcdb;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index f2a96deda6..bbb74d4263 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -1,6 +1,6 @@ /* Generic code for supporting multiple C++ ABI's - Copyright (C) 2001-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -21,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_assert.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,29 +66,30 @@ is_operator_name (const char *name) int baseclass_offset (struct type *type, int index, const gdb_byte *valaddr, - int embedded_offset, CORE_ADDR address, + LONGEST embedded_offset, CORE_ADDR address, const struct value *val) { - volatile struct gdb_exception ex; int res = 0; gdb_assert (current_cp_abi.baseclass_offset != NULL); - TRY_CATCH (ex, RETURN_MASK_ERROR) + 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")); + } - if (ex.reason < 0 && ex.error == NOT_AVAILABLE_ERROR) - throw_error (NOT_AVAILABLE_ERROR, - _("Cannot determine virtual baseclass offset " - "of incomplete object")); - else if (ex.reason < 0) - throw_exception (ex); - else - return res; + return res; } struct value * @@ -108,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; - volatile 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; } @@ -179,6 +179,47 @@ cplus_print_vtable (struct value *value) (*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); +} + int cp_pass_by_reference (struct type *type) { @@ -272,37 +313,34 @@ static void list_cp_abis (int from_tty) { struct ui_out *uiout = current_uiout; - 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"); + 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) { @@ -314,33 +352,56 @@ set_cp_abi_cmd (char *args, int from_tty) error (_("Could not find \"%s\" in ABI list"), args); } +/* A completion function for "set cp-abi". */ + +static void +cp_abi_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + static const char **cp_abi_names; + + if (cp_abi_names == NULL) + { + int i; + + 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); +} + /* Show the currently selected C++ ABI. */ static void -show_cp_abi_cmd (char *args, int from_tty) +show_cp_abi_cmd (const char *args, int from_tty) { struct ui_out *uiout = current_uiout; - ui_out_text (uiout, "The currently selected C++ ABI is \""); + uiout->text ("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"); + uiout->field_string ("cp-abi", current_cp_abi.shortname); + uiout->text ("\" ("); + uiout->field_string ("longname", current_cp_abi.longname); + uiout->text (").\n"); } -extern initialize_file_ftype _initialize_cp_abi; /* -Wmissing-prototypes */ - 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."),