6f937416b9
This is sort of a continuation of Keith's parse_exp_1 constification patch. It started out by undoing these bits: @@ -754,9 +754,12 @@ validate_actionline (char **line, struct tmp_p = p; for (loc = t->base.loc; loc; loc = loc->next) { - p = tmp_p; - exp = parse_exp_1 (&p, loc->address, + const char *q; + + q = tmp_p; + exp = parse_exp_1 (&q, loc->address, block_for_pc (loc->address), 1); + p = (char *) q; and progressively making more things const upwards, fixing fallout, rinse repeat, until GDB built again (--enable-targets=all). That ended up constifying lookup_cmd/add_cmd and (lots of) friends, and the completers. I didn't try to constify the command hooks themselves, because I know upfront there are commands that write to the command string argument, and I think I managed to stop at a nice non-hacky split point already. I think the only non-really-super-obvious changes are tracepoint.c:validate_actionline, and tracepoint.c:trace_dump_actions. The rest is just mostly about 'char *' => 'const char *', 'char **'=> 'const char **', and the occasional (e.g., deprecated_cmd_warning) case of 'char **'=> 'const char *', where/when I noticed that nothing actually cares about the pointer to pointer output. Tested on x86_64 Fedora 17, native and gdbserver. gdb/ 2013-03-13 Pedro Alves <palves@redhat.com> * ada-lang.c (struct add_partial_datum) <text, text0, word>: Make fields const. (ada_make_symbol_completion_list): Make "text0" parameter const. * ax-gdb.c (agent_eval_command_one): Make "exp" parameter const. * breakpoint.c (condition_completer): Make "text" and "word" parameters const. Adjust. (check_tracepoint_command): Adjust to validate_actionline prototype change. (catch_syscall_completer): Make "text" and "word" parameters const. * cli/cli-cmds.c (show_user): Make "comname" local const. (valid_command_p): Make "command" parameter const. (alias_command): Make "alias_prefix" and "command_prefix" locals const. * cli/cli-decode.c (add_cmd): Make "name" parameter const. (add_alias_cmd): Make "name" and "oldname" parameters const. Adjust. No longer make copy of OLDNAME. (add_prefix_cmd, add_abbrev_prefix_cmd, add_set_or_show_cmd) (add_setshow_cmd_full, add_setshow_enum_cmd) (add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd) (add_setshow_filename_cmd, add_setshow_string_cmd) (add_setshow_string_noescape_cmd) (add_setshow_optional_filename_cmd, add_setshow_integer_cmd) (add_setshow_uinteger_cmd, add_setshow_zinteger_cmd) (add_setshow_zuinteger_unlimited_cmd, add_setshow_zuinteger_cmd) (delete_cmd, add_info, add_info_alias, add_com, add_com_alias): Make "name" parameter const. (help_cmd): Rename "command" parameter to "arg". New const local "command". (find_cmd): Make "command" parameter const. (lookup_cmd_1): Make "text" parameter pointer to const. Adjust to deprecated_cmd_warning prototype change. (undef_cmd_error): Make "cmdtype" parameter const. (lookup_cmd): Make "line" parameter const. (deprecated_cmd_warning): Change type of "text" parameter to pointer to const char, from pointer to pointer to char. Adjust. (lookup_cmd_composition): Make "text" parameter const. (complete_on_cmdlist, complete_on_enum): Make "text" and "word" parameters const. * cli/cli-decode.h (struct cmd_list_element) <name>: Make field const. * cli/cli-script.c (validate_comname): Make "tem" local const. (define_command): New const local "tem_c". Use it in calls to lookup_cmd. (document_command): Make "tem" and "comfull" locals const. (show_user_1): Make "prefix" and "name" parameters const. * cli-script.h (show_user_1): Make "prefix" and "name" parameters const. * command.h (add_cmd, add_alias_cmd, add_prefix_cmd) (add_abbrev_prefix_cmd, completer_ftype, lookup_cmd, lookup_cmd_1) (deprecated_cmd_warning, lookup_cmd_composition, add_com) (add_com_alias, add_info, add_info_alias, complete_on_cmdlist) (complete_on_enum, add_setshow_enum_cmd) (add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd) (add_setshow_filename_cmd, add_setshow_string_cmd) (add_setshow_string_noescape_cmd) (add_setshow_optional_filename_cmd, add_setshow_integer_cmd) (add_setshow_uinteger_cmd, add_setshow_zinteger_cmd) (add_setshow_zuinteger_cmd, add_setshow_zuinteger_unlimited_cmd): Change prototypes, constifying strings. * completer.c (noop_completer, filename_completer): Make "text" and "prefix" parameters const. (location_completer, expression_completer) (complete_line_internal): Make "text" and "prefix" parameters const and adjust. (command_completer, signal_completer): Make "text" and "prefix" parameters const. * completer.h (noop_completer, filename_completer) (expression_completer, location_completer, command_completer) (signal_completer): Change prototypes. * corefile.c (complete_set_gnutarget): Make "text" and "word" parameters const. * cp-abi.c (cp_abi_completer): Likewise. * expression.h (parse_expression_for_completion): Change prototype. * f-lang.c (f_make_symbol_completion_list): Make "text" and "word" parameters const. * infcmd.c (_initialize_infcmd): Make "cmd_name" local const. * infrun.c (handle_completer): Make "text" and "word" parameters const. * interps.c (interpreter_completer): Make "text" and "word" parameters const. * language.h (struct language_defn) <la_make_symbol_completion_list>: Make "text" and "word" parameters const. * parse.c (parse_exp_1): Move const hack to parse_exp_in_context. (parse_exp_in_context): Rename to ... (parse_exp_in_context_1): ... this. (parse_exp_in_context): Reimplement, with const hack from parse_exp_1. (parse_expression_for_completion): Make "string" parameter const. * printcmd.c (decode_format): Make "string_ptr" parameter pointer to pointer to const char. Adjust. (print_command_1): Make "exp" parameter const. (output_command): Rename to ... (output_command_const): ... this. Make "exp" parameter const. (output_command): Reimplement. (x_command): Adjust. (display_command): Rename "exp" parameter to "arg". New "exp" local, const version of "arg". * python/py-auto-load.c (gdbpy_initialize_auto_load): Make "cmd_name" local const. * python/py-cmd.c (cmdpy_destroyer): Cast const away in xfree call. (cmdpy_completer): Make "text" and "word" parameters const. (gdbpy_parse_command_name): Make "prefix_text2" local const. * python/py-param.c (add_setshow_generic): Make "tmp_name" local const. * remote.c (_initialize_remote): Make "cmd_name" local const. * symtab.c (language_search_unquoted_string): Make "text" and "p" parameters const. Adjust. (completion_list_add_fields): Make "sym_text", "text" and "word" parameters const. (struct add_name_data) <sym_text, text, word>: Make fields const. (default_make_symbol_completion_list_break_on): Make "text" and "word" parameters const. Adjust locals. (default_make_symbol_completion_list) (make_symbol_completion_list, make_symbol_completion_type) (make_symbol_completion_list_fn): Make "text" and "word" parameters const. (make_file_symbol_completion_list): Make "text", "word" and "srcfile" parameters const. Adjust locals. (add_filename_to_list): Make "text" and "word" parameters const. (struct add_partial_filename_data) <text, word>: Make fields const. (make_source_files_completion_list): Make "text" and "word" parameters const. * symtab.h (default_make_symbol_completion_list_break_on) (default_make_symbol_completion_list, make_symbol_completion_list) (make_symbol_completion_type enum type_code) (make_symbol_completion_list_fn make_file_symbol_completion_list) (make_source_files_completion_list): Change prototype. * top.c (execute_command): Adjust to pass pointer to pointer to const char to lookup_cmd, and to deprecated_cmd_warning prototype change. (set_verbose): Make "cmdname" local const. * tracepoint.c (decode_agent_options): Make "exp" parameter const, and adjust. (validate_actionline): Make "line" parameter a pointer to const char, and adjust. (encode_actions_1): Make "action_exp" local const, and adjust. (encode_actions): Adjust. (replace_comma): Delete. (trace_dump_actions): Make "action_exp" and "next_comma" locals const, and adjust. Don't frob the action string while splitting it at commas. Instead, make a copy of each split substring in turn. (trace_dump_command): Adjust to validate_actionline prototype change. * tracepoint.h (decode_agent_options, decode_agent_options) (encode_actions, validate_actionline): Change prototypes. * valprint.h (output_command): Delete declaration. (output_command_const): Declare. * value.c (function_destroyer): Cast const away in xfree call.
372 lines
9.4 KiB
C
372 lines
9.4 KiB
C
/* Generic code for supporting multiple C++ ABI's
|
|
|
|
Copyright (C) 2001-2013 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 "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 };
|
|
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,
|
|
int 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)
|
|
{
|
|
res = (*current_cp_abi.baseclass_offset) (type, index, valaddr,
|
|
embedded_offset,
|
|
address, val);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
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)
|
|
{
|
|
struct type *ret = NULL;
|
|
volatile struct gdb_exception e;
|
|
|
|
if ((current_cp_abi.rtti_type) == NULL)
|
|
return NULL;
|
|
TRY_CATCH (e, RETURN_MASK_ERROR)
|
|
{
|
|
ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
|
|
}
|
|
if (e.reason < 0)
|
|
return NULL;
|
|
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);
|
|
}
|
|
|
|
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);
|
|
}
|