1999-04-16 03:35:26 +02:00
|
|
|
/* Basic C++ demangling support for GDB.
|
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* ax-gdb.c, c-valprint.c, charset.c, corefile.c: Update copyright.
* demangle.c, disasm.c, dwarf2cfi.c, dwarfread.c: Update copyright.
* elfread.c, eval.c, expprint.c, expression.h: Update copyright.
* f-typeprint.c, findvar.c, gcore.c, gdb_mbuild.sh: Update copyright.
* gdbtypes.h, gnu-v2-abi.c, inferior.h, inftarg.c: Update copyright.
* language.c, language.h, m32r-tdep.c: Update copyright.
* mn10200-tdep.c, scm-lang.c, scm-lang.h: Update copyright.
* somsolib.c, somsolib.h, symfile.c, symtab.h: Update copyright.
* thread-db.c, typeprint.c, utils.c, valarith.c: Update copyright.
* values.c, win32-nat.c, x86-64-linux-nat.c: Update copyright.
* x86-64-linux-tdep.c, z8k-tdep.c: Update copyright.
* cli/cli-decode.h, config/h8500/tm-h8500.h: Update copyright.
Index: mi/ChangeLog
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* mi-cmd-env.c: Update copyright.
2003-01-14 01:49:06 +01:00
|
|
|
|
2017-01-01 07:50:51 +01:00
|
|
|
Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* ax-gdb.c, c-valprint.c, charset.c, corefile.c: Update copyright.
* demangle.c, disasm.c, dwarf2cfi.c, dwarfread.c: Update copyright.
* elfread.c, eval.c, expprint.c, expression.h: Update copyright.
* f-typeprint.c, findvar.c, gcore.c, gdb_mbuild.sh: Update copyright.
* gdbtypes.h, gnu-v2-abi.c, inferior.h, inftarg.c: Update copyright.
* language.c, language.h, m32r-tdep.c: Update copyright.
* mn10200-tdep.c, scm-lang.c, scm-lang.h: Update copyright.
* somsolib.c, somsolib.h, symfile.c, symtab.h: Update copyright.
* thread-db.c, typeprint.c, utils.c, valarith.c: Update copyright.
* values.c, win32-nat.c, x86-64-linux-nat.c: Update copyright.
* x86-64-linux-tdep.c, z8k-tdep.c: Update copyright.
* cli/cli-decode.h, config/h8500/tm-h8500.h: Update copyright.
Index: mi/ChangeLog
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* mi-cmd-env.c: Update copyright.
2003-01-14 01:49:06 +01:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
Written by Fred Fish at Cygnus Support.
|
|
|
|
|
|
|
|
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
|
2007-08-23 20:08:50 +02:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-04-16 03:35:26 +02:00
|
|
|
(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
|
2007-08-23 20:08:50 +02:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* This file contains support code for C++ demangling that is common
|
2011-01-07 20:36:19 +01:00
|
|
|
to a styles of demangling, and GDB specific. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
#include "defs.h"
|
2015-01-11 23:06:34 +01:00
|
|
|
#include "cli/cli-utils.h" /* for skip_to_space */
|
1999-04-16 03:35:26 +02:00
|
|
|
#include "command.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "demangle.h"
|
2011-11-10 21:21:29 +01:00
|
|
|
#include "gdb-demangle.h"
|
2015-01-11 23:06:34 +01:00
|
|
|
#include "language.h"
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
/* Select the default C++ demangling style to use. The default is "auto",
|
|
|
|
which allows gdb to attempt to pick an appropriate demangling style for
|
|
|
|
the executable it has loaded. It can be set to a specific style ("gnu",
|
|
|
|
"lucid", "arm", "hp", etc.) in which case gdb will never attempt to do auto
|
|
|
|
selection of the style unless you do an explicit "set demangle auto".
|
|
|
|
To select one of these as the default, set DEFAULT_DEMANGLING_STYLE in
|
2011-01-07 20:36:19 +01:00
|
|
|
the appropriate target configuration file. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
#ifndef DEFAULT_DEMANGLING_STYLE
|
|
|
|
#define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
|
|
|
|
#endif
|
|
|
|
|
2015-01-11 23:06:34 +01:00
|
|
|
static void demangle_command (char *, int);
|
|
|
|
|
2011-11-10 21:21:29 +01:00
|
|
|
/* See documentation in gdb-demangle.h. */
|
|
|
|
int demangle = 1;
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_demangle (struct ui_file *file, int from_tty,
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
{
|
|
|
|
fprintf_filtered (file,
|
|
|
|
_("Demangling of encoded C++/ObjC names "
|
|
|
|
"when displaying symbols is %s.\n"),
|
|
|
|
value);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* See documentation in gdb-demangle.h. */
|
|
|
|
int asm_demangle = 0;
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_asm_demangle (struct ui_file *file, int from_tty,
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
{
|
|
|
|
fprintf_filtered (file,
|
|
|
|
_("Demangling of C++/ObjC names in "
|
|
|
|
"disassembly listings is %s.\n"),
|
|
|
|
value);
|
|
|
|
}
|
1999-05-25 20:09:09 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
/* String name for the current demangling style. Set by the
|
|
|
|
"set demangle-style" command, printed as part of the output by the
|
2011-01-07 20:36:19 +01:00
|
|
|
"show demangle-style" command. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
static const char *current_demangling_style_string;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2001-02-19 12:47:16 +01:00
|
|
|
/* The array of names of the known demanglyng styles. Generated by
|
|
|
|
_initialize_demangler from libiberty_demanglers[] array. */
|
|
|
|
|
|
|
|
static const char **demangling_style_names;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 14:51:36 +01:00
|
|
|
static void
|
|
|
|
show_demangling_style_names(struct ui_file *file, int from_tty,
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
{
|
|
|
|
fprintf_filtered (file, _("The current C++ demangling style is \"%s\".\n"),
|
|
|
|
value);
|
|
|
|
}
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
/* Set current demangling style. Called by the "set demangle-style"
|
|
|
|
command after it has updated the current_demangling_style_string to
|
|
|
|
match what the user has entered.
|
|
|
|
|
|
|
|
If the user has entered a string that matches a known demangling style
|
|
|
|
name in the demanglers[] array then just leave the string alone and update
|
|
|
|
the current_demangling_style enum value to match.
|
|
|
|
|
|
|
|
If the user has entered a string that doesn't match, including an empty
|
|
|
|
string, then print a list of the currently known styles and restore
|
|
|
|
the current_demangling_style_string to match the current_demangling_style
|
|
|
|
enum value.
|
|
|
|
|
|
|
|
Note: Assumes that current_demangling_style_string always points to
|
2011-01-07 20:36:19 +01:00
|
|
|
a malloc'd string, even if it is a null-string. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2000-11-14 17:46:24 +01:00
|
|
|
const struct demangler_engine *dem;
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
int i;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/* First just try to match whatever style name the user supplied with
|
|
|
|
one of the known ones. Don't bother special casing for an empty
|
|
|
|
name, we just treat it as any other style name that doesn't match.
|
2011-01-07 20:36:19 +01:00
|
|
|
If we match, update the current demangling style enum. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
for (dem = libiberty_demanglers, i = 0;
|
2000-11-14 17:46:24 +01:00
|
|
|
dem->demangling_style != unknown_demangling;
|
|
|
|
dem++)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2003-01-09 19:30:32 +01:00
|
|
|
if (strcmp (current_demangling_style_string,
|
|
|
|
dem->demangling_style_name) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
current_demangling_style = dem->demangling_style;
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
current_demangling_style_string = demangling_style_names[i];
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
}
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
i++;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
/* We should have found a match, given we only add known styles to
|
|
|
|
the enumeration list. */
|
|
|
|
gdb_assert (dem->demangling_style != unknown_demangling);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
2002-10-11 16:02:39 +02:00
|
|
|
/* G++ uses a special character to indicate certain internal names. Which
|
|
|
|
character it is depends on the platform:
|
|
|
|
- Usually '$' on systems where the assembler will accept that
|
|
|
|
- Usually '.' otherwise (this includes most sysv4-like systems and most
|
|
|
|
ELF targets)
|
|
|
|
- Occasionally '_' if neither of the above is usable
|
|
|
|
|
|
|
|
We check '$' first because it is the safest, and '.' often has another
|
|
|
|
meaning. We don't currently try to handle '_' because the precise forms
|
|
|
|
of the names are different on those targets. */
|
|
|
|
|
|
|
|
static char cplus_markers[] = {'$', '.', '\0'};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2011-11-10 21:21:29 +01:00
|
|
|
/* See documentation in gdb-demangle.h. */
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
int
|
2000-07-30 03:48:28 +02:00
|
|
|
is_cplus_marker (int c)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
return c && strchr (cplus_markers, c) != NULL;
|
|
|
|
}
|
|
|
|
|
2015-01-11 23:06:34 +01:00
|
|
|
/* Demangle the given string in the current language. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
demangle_command (char *args, int from_tty)
|
|
|
|
{
|
2017-08-14 07:38:09 +02:00
|
|
|
char *demangled;
|
|
|
|
const char *name;
|
|
|
|
const char *arg_start;
|
2015-01-11 23:06:34 +01:00
|
|
|
int processing_args = 1;
|
|
|
|
const struct language_defn *lang;
|
|
|
|
|
2017-08-14 07:38:09 +02:00
|
|
|
std::string arg_buf = args != NULL ? args : "";
|
|
|
|
arg_start = arg_buf.c_str ();
|
2015-01-11 23:06:34 +01:00
|
|
|
|
2017-09-10 22:48:30 +02:00
|
|
|
std::string lang_name;
|
2015-01-11 23:06:34 +01:00
|
|
|
while (processing_args
|
|
|
|
&& *arg_start == '-')
|
|
|
|
{
|
Rename _const functions to use overloading instead
This renames a few functions -- skip_spaces_const,
skip_to_space_const, get_number_const, extract_arg_const -- to drop
the "_const" suffix and instead rely on overloading.
This makes future const fixes simpler by reducing the number of lines
that must be changed. I think it is also not any less clear, as all
these functions have the same interface as their non-const versions by
design. Furthermore there's an example of using an overload in-tree
already, namely check_for_argument.
This patch was largely created using some perl one-liners; then a few
fixes were applied by hand.
ChangeLog
2017-09-11 Tom Tromey <tom@tromey.com>
* common/common-utils.h (skip_to_space): Remove macro, redeclare
as function.
(skip_to_space): Rename from skip_to_space_const.
* common/common-utils.c (skip_to_space): New function.
(skip_to_space): Rename from skip_to_space_const.
* cli/cli-utils.h (get_number): Rename from get_number_const.
(extract_arg): Rename from extract_arg_const.
* cli/cli-utils.c (get_number): Rename from get_number_const.
(extract_arg): Rename from extract_arg_const.
(number_or_range_parser::get_number): Use ::get_number.
* aarch64-linux-tdep.c, ada-lang.c, arm-linux-tdep.c, ax-gdb.c,
break-catch-throw.c, breakpoint.c, cli/cli-cmds.c, cli/cli-dump.c,
cli/cli-script.c, cli/cli-setshow.c, compile/compile.c,
completer.c, demangle.c, disasm.c, findcmd.c, linespec.c,
linux-tdep.c, linux-thread-db.c, location.c, mi/mi-parse.c,
minsyms.c, nat/linux-procfs.c, printcmd.c, probe.c,
python/py-breakpoint.c, record.c, rust-exp.y, serial.c, stack.c,
stap-probe.c, tid-parse.c, tracepoint.c: Update all callers.
2017-09-10 22:19:19 +02:00
|
|
|
const char *p = skip_to_space (arg_start);
|
2015-01-11 23:06:34 +01:00
|
|
|
|
|
|
|
if (strncmp (arg_start, "-l", p - arg_start) == 0)
|
2017-09-10 22:48:30 +02:00
|
|
|
lang_name = extract_arg (&p);
|
2015-01-11 23:06:34 +01:00
|
|
|
else if (strncmp (arg_start, "--", p - arg_start) == 0)
|
|
|
|
processing_args = 0;
|
|
|
|
else
|
|
|
|
{
|
2017-09-10 22:48:30 +02:00
|
|
|
std::string option = extract_arg (&p);
|
2015-01-11 23:06:34 +01:00
|
|
|
error (_("Unrecognized option '%s' to demangle command. "
|
2017-09-10 22:48:30 +02:00
|
|
|
"Try \"help demangle\"."), option.c_str ());
|
2015-01-11 23:06:34 +01:00
|
|
|
}
|
|
|
|
|
Rename _const functions to use overloading instead
This renames a few functions -- skip_spaces_const,
skip_to_space_const, get_number_const, extract_arg_const -- to drop
the "_const" suffix and instead rely on overloading.
This makes future const fixes simpler by reducing the number of lines
that must be changed. I think it is also not any less clear, as all
these functions have the same interface as their non-const versions by
design. Furthermore there's an example of using an overload in-tree
already, namely check_for_argument.
This patch was largely created using some perl one-liners; then a few
fixes were applied by hand.
ChangeLog
2017-09-11 Tom Tromey <tom@tromey.com>
* common/common-utils.h (skip_to_space): Remove macro, redeclare
as function.
(skip_to_space): Rename from skip_to_space_const.
* common/common-utils.c (skip_to_space): New function.
(skip_to_space): Rename from skip_to_space_const.
* cli/cli-utils.h (get_number): Rename from get_number_const.
(extract_arg): Rename from extract_arg_const.
* cli/cli-utils.c (get_number): Rename from get_number_const.
(extract_arg): Rename from extract_arg_const.
(number_or_range_parser::get_number): Use ::get_number.
* aarch64-linux-tdep.c, ada-lang.c, arm-linux-tdep.c, ax-gdb.c,
break-catch-throw.c, breakpoint.c, cli/cli-cmds.c, cli/cli-dump.c,
cli/cli-script.c, cli/cli-setshow.c, compile/compile.c,
completer.c, demangle.c, disasm.c, findcmd.c, linespec.c,
linux-tdep.c, linux-thread-db.c, location.c, mi/mi-parse.c,
minsyms.c, nat/linux-procfs.c, printcmd.c, probe.c,
python/py-breakpoint.c, record.c, rust-exp.y, serial.c, stack.c,
stap-probe.c, tid-parse.c, tracepoint.c: Update all callers.
2017-09-10 22:19:19 +02:00
|
|
|
arg_start = skip_spaces (p);
|
2015-01-11 23:06:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
name = arg_start;
|
|
|
|
|
|
|
|
if (*name == '\0')
|
|
|
|
error (_("Usage: demangle [-l language] [--] name"));
|
|
|
|
|
2017-09-10 22:48:30 +02:00
|
|
|
if (!lang_name.empty ())
|
2015-01-11 23:06:34 +01:00
|
|
|
{
|
|
|
|
enum language lang_enum;
|
|
|
|
|
2017-09-10 22:48:30 +02:00
|
|
|
lang_enum = language_enum (lang_name.c_str ());
|
2015-01-11 23:06:34 +01:00
|
|
|
if (lang_enum == language_unknown)
|
2017-09-10 22:48:30 +02:00
|
|
|
error (_("Unknown language \"%s\""), lang_name.c_str ());
|
2015-01-11 23:06:34 +01:00
|
|
|
lang = language_def (lang_enum);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
lang = current_language;
|
|
|
|
|
|
|
|
demangled = language_demangle (lang, name, DMGL_ANSI | DMGL_PARAMS);
|
|
|
|
if (demangled != NULL)
|
|
|
|
{
|
|
|
|
printf_filtered ("%s\n", demangled);
|
|
|
|
xfree (demangled);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
error (_("Can't demangle \"%s\""), name);
|
|
|
|
}
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
_initialize_demangler (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2001-02-19 12:47:16 +01:00
|
|
|
int i, ndems;
|
|
|
|
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
/* Fill the demangling_style_names[] array, and set the default
|
|
|
|
demangling style chosen at compilation time. */
|
2001-02-19 12:47:16 +01:00
|
|
|
for (ndems = 0;
|
|
|
|
libiberty_demanglers[ndems].demangling_style != unknown_demangling;
|
|
|
|
ndems++)
|
|
|
|
;
|
2015-09-25 20:08:06 +02:00
|
|
|
demangling_style_names = XCNEWVEC (const char *, ndems + 1);
|
2001-02-19 12:47:16 +01:00
|
|
|
for (i = 0;
|
|
|
|
libiberty_demanglers[i].demangling_style != unknown_demangling;
|
|
|
|
i++)
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
{
|
|
|
|
demangling_style_names[i]
|
|
|
|
= xstrdup (libiberty_demanglers[i].demangling_style_name);
|
|
|
|
|
|
|
|
if (current_demangling_style_string == NULL
|
|
|
|
&& strcmp (DEFAULT_DEMANGLING_STYLE, demangling_style_names[i]) == 0)
|
|
|
|
current_demangling_style_string = demangling_style_names[i];
|
|
|
|
}
|
2001-02-19 12:47:16 +01:00
|
|
|
|
2011-11-10 21:21:29 +01:00
|
|
|
add_setshow_boolean_cmd ("demangle", class_support, &demangle, _("\
|
|
|
|
Set demangling of encoded C++/ObjC names when displaying symbols."), _("\
|
|
|
|
Show demangling of encoded C++/ObjC names when displaying symbols."), NULL,
|
|
|
|
NULL,
|
|
|
|
show_demangle,
|
|
|
|
&setprintlist, &showprintlist);
|
|
|
|
|
|
|
|
add_setshow_boolean_cmd ("asm-demangle", class_support, &asm_demangle, _("\
|
|
|
|
Set demangling of C++/ObjC names in disassembly listings."), _("\
|
|
|
|
Show demangling of C++/ObjC names in disassembly listings."), NULL,
|
|
|
|
NULL,
|
|
|
|
show_asm_demangle,
|
|
|
|
&setprintlist, &showprintlist);
|
|
|
|
|
2005-02-21 05:31:59 +01:00
|
|
|
add_setshow_enum_cmd ("demangle-style", class_support,
|
|
|
|
demangling_style_names,
|
Fix completer.c FIXME, and invalid pointer to pointer conversion.
As mentioned in the previous patch, I grepped for "\*\*) &" and found
one hit in completer.c.
I was about to post a patch that simply made
current_demangling_style_string const, and cast away constness at the
xfree site. However, looking deeper, it seem to be there's a lot of
dead code in the file.
First, all external callers of set_demangling_style are found in the
stabs reader, commented out for over 12 years:
http://sourceware.org/ml/gdb-patches/2000-12/msg00214.html
I don't think it's likely we'll ever make the older mangling schemes
work for stabs. If we do, we can rediscuss the approach then.
Then, set_demangling_command has special handling for unknown
demangling styles, but "set demangle-style" is an enum command, and
with those, the user can only specify a known enumeration value, by
design:
(gdb) set demangle-style gangnam-style
Undefined item: "gangnam-style".
This patch removes all that dead code, then makes
current_demangling_style_string point to an element of
demangling_style_names, as the FIXME suggests, and then makes
current_demangling_style_string, removing the need for the 'const char
**' cast.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* dbxread.c (read_ofile_symtab, process_one_symbol): Remove
commented out code.
* demangle.c (current_demangling_style_string): Make it const.
(set_demangling_command): Assert the demangling style is known.
Remove all handling of unknown styles. Set
'current_demangling_style_string' to an element of the
demangling_style_names array.
(set_demangling_style): Delete.
(_initialize_demangler): Set current_demangling_style_string to the
element of the demangling_style_names array that corresponds to
the default demangling style. Remove FIXME note. Don't call
set_demangling_style.
* gdb-demangle.h (set_demangling_style): Remove declaration.
2013-03-13 19:38:12 +01:00
|
|
|
¤t_demangling_style_string, _("\
|
2005-02-21 05:31:59 +01:00
|
|
|
Set the current C++ demangling style."), _("\
|
|
|
|
Show the current C++ demangling style."), _("\
|
|
|
|
Use `set demangle-style' without arguments for a list of demangling styles."),
|
|
|
|
set_demangling_command,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 14:51:36 +01:00
|
|
|
show_demangling_style_names,
|
2005-02-21 05:31:59 +01:00
|
|
|
&setlist, &showlist);
|
2015-01-11 23:06:34 +01:00
|
|
|
|
|
|
|
add_cmd ("demangle", class_support, demangle_command, _("\
|
|
|
|
Demangle a mangled name.\n\
|
|
|
|
Usage: demangle [-l language] [--] name\n\
|
|
|
|
If LANGUAGE is not specified, NAME is demangled in the current language."),
|
|
|
|
&cmdlist);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|