2f408ecb92
This replaces most of the remaining ui_file_xstrdup calls with ui_file_as_string calls. Whenever a call was replaced, that led to a cascade of other necessary adjustments throughout, to make the code use std::string instead of raw pointers. And then whenever I added a std::string as member of a struct, I needed to adjust allocation/destruction of said struct to use new/delete instead of xmalloc/xfree. The stopping point was once gdb built again. These doesn't seem to be a way to reasonably split this out further. Maybe-not-obvious changes: - demangle_for_lookup returns a cleanup today. To get rid of that, and avoid unnecessary string dupping/copying, this introduces a demangle_result_storage type that the caller instantiates and passes to demangle_for_lookup. - Many methods returned a "char *" to indicate that the caller owns the memory and must free it. Those are switched to return a std::string instead. Methods that return a "view" into some internal string return a "const char *" instead. I.e., we only copy/allocate when necessary. gdb/ChangeLog: 2016-11-08 Pedro Alves <palves@redhat.com> * ada-lang.c (ada_name_for_lookup, type_as_string): Use and return std::string. (type_as_string_and_cleanup): Delete. (ada_lookup_struct_elt_type): Use type_as_string. * ada-lang.h (ada_name_for_lookup): Now returns std::string. * ada-varobj.c (ada_varobj_scalar_image): Return a std::string. (ada_varobj_describe_child): Make 'child_name' and 'child_path_expr' parameters std::string pointers. (ada_varobj_describe_struct_child, ada_varobj_describe_ptr_child): Likewise, and use string_printf. (ada_varobj_describe_simple_array_child) (ada_varobj_describe_child): Likewise. (ada_varobj_get_name_of_child, ada_varobj_get_path_expr_of_child) (ada_varobj_get_value_image) (ada_varobj_get_value_of_array_variable) (ada_varobj_get_value_of_variable, ada_name_of_variable) (ada_name_of_child, ada_path_expr_of_child) (ada_value_of_variable): Now returns std::string. Use string_printf. (ada_value_of_child): Adjust. * break-catch-throw.c (check_status_exception_catchpoint): Adjust to use std::string. * breakpoint.c (watch_command_1): Adjust to use std::string. * c-lang.c (c_get_string): Adjust to use std::string. * c-typeprint.c (print_name_maybe_canonical): Use std::string. * c-varobj.c (varobj_is_anonymous_child): Use ==/!= std::string operators. (c_name_of_variable): Now returns a std::string. (c_describe_child): The 'cname' and 'cfull_expression' output parameters are now std::string pointers. Adjust. (c_name_of_child, c_path_expr_of_child, c_value_of_variable) (cplus_number_of_children): Adjust to use std::string and string_printf. (cplus_name_of_variable): Now returns a std::string. (cplus_describe_child): The 'cname' and 'cfull_expression' output parameters are now std::string pointers. Adjust. (cplus_name_of_child, cplus_path_expr_of_child) (cplus_value_of_variable): Now returns a std::string. * cp-abi.c (cplus_typename_from_type_info): Return std::string. * cp-abi.h (cplus_typename_from_type_info): Return std::string. (struct cp_abi_ops) <get_typename_from_type_info>: Return std::string. * cp-support.c (inspect_type): Use std::string. (cp_canonicalize_string_full, cp_canonicalize_string_no_typedefs) (cp_canonicalize_string): Return std::string and adjust. * cp-support.h (cp_canonicalize_string) (cp_canonicalize_string_no_typedefs, cp_canonicalize_string_full): Return std::string. * dbxread.c (read_dbx_symtab): Use std::string. * dwarf2read.c (dwarf2_canonicalize_name): Adjust to use std::string. * gdbcmd.h (lookup_struct_elt_type): Adjust to use std::string. * gnu-v3-abi.c (gnuv3_get_typeid): Use std::string. (gnuv3_get_typename_from_type_info): Return a std::string and adjust. (gnuv3_get_type_from_type_info): Adjust to use std::string. * guile/guile.c (gdbscm_execute_gdb_command): Adjust to use std::string. * infcmd.c (print_return_value_1): Adjust to use std::string. * linespec.c (find_linespec_symbols): Adjust to demangle_for_lookup API change. Use std::string. * mi/mi-cmd-var.c (print_varobj, mi_cmd_var_set_format) (mi_cmd_var_info_type, mi_cmd_var_info_path_expression) (mi_cmd_var_info_expression, mi_cmd_var_evaluate_expression) (mi_cmd_var_assign, varobj_update_one): Adjust to use std::string. * minsyms.c (lookup_minimal_symbol): Use std::string. * python/py-varobj.c (py_varobj_iter_next): Use new instead of XNEW. vitem->name is a std::string now, adjust. * rust-exp.y (convert_ast_to_type, convert_name): Adjust to use std::string. * stabsread.c (define_symbol): Adjust to use std::string. * symtab.c (demangle_for_lookup): Now returns 'const char *'. Add a demangle_result_storage parameter. Use it for storage. (lookup_symbol_in_language) (lookup_symbol_in_objfile_from_linkage_name): Adjust to new demangle_for_lookup API. * symtab.h (struct demangle_result_storage): New type. (demangle_for_lookup): Now returns 'const char *'. Add a demangle_result_storage parameter. * typeprint.c (type_to_string): Return std::string and use ui_file_as_string. * value.h (type_to_string): Change return type to std::string. * varobj-iter.h (struct varobj_item) <name>: Now a std::string. (varobj_iter_delete): Use delete instead of xfree. * varobj.c (create_child): Return std::string instead of char * in output parameter. (name_of_variable, name_of_child, my_value_of_variable): Return std::string instead of char *. (varobj_create, varobj_get_handle): Constify 'objname' parameter. Adjust to std::string fields. (varobj_get_objname): Return a const char * instead of a char *. (varobj_get_expression): Return a std::string. (varobj_list_children): Adjust to use std::string. (varobj_get_type): Return a std::string. (varobj_get_path_expr): Return a const char * instead of a char *. Adjust to std::string fields. (varobj_get_formatted_value, varobj_get_value): Return a std::string. (varobj_set_value): Change type of 'expression' parameter to std::string. Use std::string. (install_new_value): Use std::string. (delete_variable_1): Adjust to use std::string. (create_child): Change the 'name' parameter to a std::string reference. Swap it into the new item's name. (create_child_with_value): Swap item's name into the new child's name. Use string_printf. (new_variable): Use new instead of XNEW. (free_variable): Don't xfree fields that are now std::string. (name_of_variable, name_of_child): Now returns std::string. (value_of_root): Adjust to use std::string. (my_value_of_variable, varobj_value_get_print_value): Return and use std::string. (varobj_value_get_print_value): Adjust to use ui_file_as_string and std::string. * varobj.h (struct varobj) <name, path_expr, obj_name, print_value>: Now std::string's. <name_of_variable, name_of_child, path_expr_of_child, value_of_variable>: Return std::string. (varobj_create, varobj_get_handle): Constify 'objname' parameter. (varobj_get_objname): Return a const char * instead of a char *. (varobj_get_expression, varobj_get_type): Return a std::string. (varobj_get_path_expr): Return a const char * instead of a char *. (varobj_get_formatted_value, varobj_get_value): Return a std::string. (varobj_set_value): Constify 'expression' parameter. (varobj_value_get_print_value): Return a std::string.
415 lines
10 KiB
C
415 lines
10 KiB
C
/* Generic code for supporting multiple C++ ABI's
|
|
|
|
Copyright (C) 2001-2016 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 3 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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "value.h"
|
|
#include "cp-abi.h"
|
|
#include "command.h"
|
|
#include "gdbcmd.h"
|
|
#include "ui-out.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 gdb_byte *valaddr,
|
|
LONGEST embedded_offset, CORE_ADDR address,
|
|
const struct value *val)
|
|
{
|
|
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 (ex, RETURN_MASK_ERROR)
|
|
{
|
|
if (ex.error != NOT_AVAILABLE_ERROR)
|
|
throw_exception (ex);
|
|
|
|
throw_error (NOT_AVAILABLE_ERROR,
|
|
_("Cannot determine virtual baseclass offset "
|
|
"of incomplete object"));
|
|
}
|
|
END_CATCH
|
|
|
|
return res;
|
|
}
|
|
|
|
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,
|
|
LONGEST *top, int *using_enc)
|
|
{
|
|
struct type *ret = NULL;
|
|
|
|
if ((current_cp_abi.rtti_type) == NULL)
|
|
return NULL;
|
|
TRY
|
|
{
|
|
ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
|
|
}
|
|
CATCH (e, RETURN_MASK_ERROR)
|
|
{
|
|
return NULL;
|
|
}
|
|
END_CATCH
|
|
|
|
return ret;
|
|
}
|
|
|
|
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 (struct type *to_type)
|
|
{
|
|
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) (to_type);
|
|
}
|
|
|
|
void
|
|
cplus_make_method_ptr (struct type *type, 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) (type, contents, value, is_virtual);
|
|
}
|
|
|
|
CORE_ADDR
|
|
cplus_skip_trampoline (struct frame_info *frame,
|
|
CORE_ADDR stop_pc)
|
|
{
|
|
if (current_cp_abi.skip_trampoline == NULL)
|
|
return 0;
|
|
return (*current_cp_abi.skip_trampoline) (frame, stop_pc);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
/* 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);
|
|
}
|
|
|
|
int
|
|
cp_pass_by_reference (struct type *type)
|
|
{
|
|
if ((current_cp_abi.pass_by_reference) == NULL)
|
|
return 0;
|
|
return (*current_cp_abi.pass_by_reference) (type);
|
|
}
|
|
|
|
/* 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";
|
|
new_longname = xstrprintf ("currently \"%s\"", abi->shortname);
|
|
auto_cp_abi.longname = new_longname;
|
|
|
|
new_doc = xstrprintf ("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 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");
|
|
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);
|
|
}
|
|
|
|
/* A completion function for "set cp-abi". */
|
|
|
|
static VEC (char_ptr) *
|
|
cp_abi_completer (struct cmd_list_element *ignore,
|
|
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;
|
|
}
|
|
|
|
return complete_on_enum (cp_abi_names, text, word);
|
|
}
|
|
|
|
/* Show the currently selected C++ ABI. */
|
|
|
|
static void
|
|
show_cp_abi_cmd (char *args, int from_tty)
|
|
{
|
|
struct ui_out *uiout = current_uiout;
|
|
|
|
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)
|
|
{
|
|
struct cmd_list_element *c;
|
|
|
|
register_cp_abi (&auto_cp_abi);
|
|
switch_to_cp_abi ("auto");
|
|
|
|
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);
|
|
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."),
|
|
&showlist);
|
|
}
|