mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 10:35:12 +08:00
590042fc45
With this patch, the help docs now respect 2 invariants: * The first line of a command help is terminated by a '.' character. * The last character of a command help is not a newline character. Note that the changes for the last invariant were done by Tom, as part of : [PATCH] Remove trailing newlines from help text https://sourceware.org/ml/gdb-patches/2019-06/msg00050.html but some occurrences have been re-introduced since then. Some help docs had to be rephrased/restructured to respect the above invariants. Before this patch, print_doc_line was printing the first line of a command help documentation, but stopping at the first '.' or ',' character. This was giving inconsistent results : * The first line of command helps was sometimes '.' terminated, sometimes not. * The first line of command helps was not always designed to be readable/understandable/unambiguous when stopping at the first '.' or ',' character. This e.g. created the following inconsistencies/problems: < catch exception -- Catch Ada exceptions < catch handlers -- Catch Ada exceptions < catch syscall -- Catch system calls by their names < down-silently -- Same as the `down' command while the new help is: > catch exception -- Catch Ada exceptions, when raised. > catch handlers -- Catch Ada exceptions, when handled. > catch syscall -- Catch system calls by their names, groups and/or numbers. > down-silently -- Same as the `down' command, but does not print anything. Also, the command help doc should not be terminated by a newline character, but this was not respected by all commands. The cli-option -OPT framework re-introduced some occurences. So, the -OPT build help framework was changed to not output newlines at the end of %OPTIONS% replacement. This patch changes the help documentations to ensure the 2 invariants given above. It implied to slightly rephrase or restructure some help docs. Based on the above invariants, print_doc_line (called by 'apropos' and 'help' commands to print the first line of a command help) now outputs the full first line of a command help. This all results in a lot of small changes in the produced help docs. There are less code changes than changes in the help docs, as a lot of docs are produced by some code (e.g. the remote packet usage settings). gdb/ChangeLog 2019-08-07 Philippe Waroquiers <philippe.waroquiers@skynet.be> * cli/cli-decode.h (print_doc_line): Add for_value_prefix argument. * cli/cli-decode.c (print_doc_line): Likewise. It now prints the full first line, except when FOR_VALUE_PREFIX. In this case, the trailing '.' is not output, and the first character is uppercased. (print_help_for_command): Update call to print_doc_line. (print_doc_of_command): Likewise. * cli/cli-setshow.c (deprecated_show_value_hack): Likewise. * cli/cli-option.c (append_indented_doc): Do not append newline. (build_help_option): Append newline after first appended_indented_doc only if a second call is done. (build_help): Append 2 new lines before each option, except the first one. * compile/compile.c (_initialize_compile): Add new lines after %OPTIONS%, when not at the end of the help. Change help doc or code producing the help doc to respect the invariants. * maint-test-options.c (_initialize_maint_test_options): Likewise. Also removed the new line after 'Options:', as all other commands do not put an empty line between 'Options:' and the first option. * printcmd.c (_initialize_printcmd): Likewise. * stack.c (_initialize_stack): Likewise. * interps.c (interpreter_exec_cmd): Fix "Usage:" line that was incorrectly telling COMMAND is optional. * ada-lang.c (_initialize_ada_language): Change help doc or code producing the help doc to respect the invariants. * ada-tasks.c (_initialize_ada_tasks): Likewise. * breakpoint.c (_initialize_breakpoint): Likewise. * cli/cli-cmds.c (_initialize_cli_cmds): Likewise. * cli/cli-logging.c (_initialize_cli_logging): Likewise. * cli/cli-setshow.c (_initialize_cli_setshow): Likewise. * cli/cli-style.c (cli_style_option::add_setshow_commands, _initialize_cli_style): Likewise. * corelow.c (core_target_info): Likewise. * dwarf-index-cache.c (_initialize_index_cache): Likewise. * dwarf2read.c (_initialize_dwarf2_read): Likewise. * filesystem.c (_initialize_filesystem): Likewise. * frame.c (_initialize_frame): Likewise. * gnu-nat.c (add_task_commands): Likewise. * infcall.c (_initialize_infcall): Likewise. * infcmd.c (_initialize_infcmd): Likewise. * interps.c (_initialize_interpreter): Likewise. * language.c (_initialize_language): Likewise. * linux-fork.c (_initialize_linux_fork): Likewise. * maint-test-settings.c (_initialize_maint_test_settings): Likewise. * maint.c (_initialize_maint_cmds): Likewise. * memattr.c (_initialize_mem): Likewise. * printcmd.c (_initialize_printcmd): Likewise. * python/lib/gdb/function/strfns.py (_MemEq, _StrLen, _StrEq, _RegEx): Likewise. * ravenscar-thread.c (_initialize_ravenscar): Likewise. * record-btrace.c (_initialize_record_btrace): Likewise. * record-full.c (_initialize_record_full): Likewise. * record.c (_initialize_record): Likewise. * regcache-dump.c (_initialize_regcache_dump): Likewise. * regcache.c (_initialize_regcache): Likewise. * remote.c (add_packet_config_cmd, init_remote_threadtests, _initialize_remote): Likewise. * ser-tcp.c (_initialize_ser_tcp): Likewise. * serial.c (_initialize_serial): Likewise. * skip.c (_initialize_step_skip): Likewise. * source.c (_initialize_source): Likewise. * stack.c (_initialize_stack): Likewise. * symfile.c (_initialize_symfile): Likewise. * symtab.c (_initialize_symtab): Likewise. * target-descriptions.c (_initialize_target_descriptions): Likewise. * top.c (init_main): Likewise. * tracefile-tfile.c (tfile_target_info): Likewise. * tracepoint.c (_initialize_tracepoint): Likewise. * tui/tui-win.c (_initialize_tui_win): Likewise. * utils.c (add_internal_problem_command): Likewise. * valprint.c (value_print_option_defs): Likewise. gdb/testsuite/ChangeLog 2019-08-07 Philippe Waroquiers <philippe.waroquiers@skynet.be> * gdb.base/style.exp: Update tests for help doc new invariants. * gdb.base/help.exp: Likewise.
337 lines
8.2 KiB
C
337 lines
8.2 KiB
C
/* Copyright (C) 1986-2019 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 "gdbcmd.h"
|
|
#include "regcache.h"
|
|
#include "gdbsupport/def-vector.h"
|
|
#include "valprint.h"
|
|
#include "remote.h"
|
|
#include "reggroups.h"
|
|
#include "target.h"
|
|
#include "gdbarch.h"
|
|
|
|
/* Dump registers from regcache, used for dumping raw registers and
|
|
cooked registers. */
|
|
|
|
class register_dump_regcache : public register_dump
|
|
{
|
|
public:
|
|
register_dump_regcache (regcache *regcache, bool dump_pseudo)
|
|
: register_dump (regcache->arch ()), m_regcache (regcache),
|
|
m_dump_pseudo (dump_pseudo)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
void dump_reg (ui_file *file, int regnum) override
|
|
{
|
|
if (regnum < 0)
|
|
{
|
|
if (m_dump_pseudo)
|
|
fprintf_unfiltered (file, "Cooked value");
|
|
else
|
|
fprintf_unfiltered (file, "Raw value");
|
|
}
|
|
else
|
|
{
|
|
if (regnum < gdbarch_num_regs (m_gdbarch) || m_dump_pseudo)
|
|
{
|
|
auto size = register_size (m_gdbarch, regnum);
|
|
|
|
if (size == 0)
|
|
return;
|
|
|
|
gdb::def_vector<gdb_byte> buf (size);
|
|
auto status = m_regcache->cooked_read (regnum, buf.data ());
|
|
|
|
if (status == REG_UNKNOWN)
|
|
fprintf_unfiltered (file, "<invalid>");
|
|
else if (status == REG_UNAVAILABLE)
|
|
fprintf_unfiltered (file, "<unavailable>");
|
|
else
|
|
{
|
|
print_hex_chars (file, buf.data (), size,
|
|
gdbarch_byte_order (m_gdbarch), true);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Just print "<cooked>" for pseudo register when
|
|
regcache_dump_raw. */
|
|
fprintf_unfiltered (file, "<cooked>");
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
regcache *m_regcache;
|
|
|
|
/* Dump pseudo registers or not. */
|
|
const bool m_dump_pseudo;
|
|
};
|
|
|
|
/* Dump from reg_buffer, used when there is no thread or
|
|
registers. */
|
|
|
|
class register_dump_reg_buffer : public register_dump, reg_buffer
|
|
{
|
|
public:
|
|
register_dump_reg_buffer (gdbarch *gdbarch, bool dump_pseudo)
|
|
: register_dump (gdbarch), reg_buffer (gdbarch, dump_pseudo)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
void dump_reg (ui_file *file, int regnum) override
|
|
{
|
|
if (regnum < 0)
|
|
{
|
|
if (m_has_pseudo)
|
|
fprintf_unfiltered (file, "Cooked value");
|
|
else
|
|
fprintf_unfiltered (file, "Raw value");
|
|
}
|
|
else
|
|
{
|
|
if (regnum < gdbarch_num_regs (m_gdbarch) || m_has_pseudo)
|
|
{
|
|
auto size = register_size (m_gdbarch, regnum);
|
|
|
|
if (size == 0)
|
|
return;
|
|
|
|
auto status = get_register_status (regnum);
|
|
|
|
gdb_assert (status != REG_VALID);
|
|
|
|
if (status == REG_UNKNOWN)
|
|
fprintf_unfiltered (file, "<invalid>");
|
|
else
|
|
fprintf_unfiltered (file, "<unavailable>");
|
|
}
|
|
else
|
|
{
|
|
/* Just print "<cooked>" for pseudo register when
|
|
regcache_dump_raw. */
|
|
fprintf_unfiltered (file, "<cooked>");
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
/* For "maint print registers". */
|
|
|
|
class register_dump_none : public register_dump
|
|
{
|
|
public:
|
|
register_dump_none (gdbarch *arch)
|
|
: register_dump (arch)
|
|
{}
|
|
|
|
protected:
|
|
void dump_reg (ui_file *file, int regnum) override
|
|
{}
|
|
};
|
|
|
|
/* For "maint print remote-registers". */
|
|
|
|
class register_dump_remote : public register_dump
|
|
{
|
|
public:
|
|
register_dump_remote (gdbarch *arch)
|
|
: register_dump (arch)
|
|
{}
|
|
|
|
protected:
|
|
void dump_reg (ui_file *file, int regnum) override
|
|
{
|
|
if (regnum < 0)
|
|
{
|
|
fprintf_unfiltered (file, "Rmt Nr g/G Offset");
|
|
}
|
|
else if (regnum < gdbarch_num_regs (m_gdbarch))
|
|
{
|
|
int pnum, poffset;
|
|
|
|
if (remote_register_number_and_offset (m_gdbarch, regnum,
|
|
&pnum, &poffset))
|
|
fprintf_unfiltered (file, "%7d %11d", pnum, poffset);
|
|
}
|
|
}
|
|
};
|
|
|
|
/* For "maint print register-groups". */
|
|
|
|
class register_dump_groups : public register_dump
|
|
{
|
|
public:
|
|
register_dump_groups (gdbarch *arch)
|
|
: register_dump (arch)
|
|
{}
|
|
|
|
protected:
|
|
void dump_reg (ui_file *file, int regnum) override
|
|
{
|
|
if (regnum < 0)
|
|
fprintf_unfiltered (file, "Groups");
|
|
else
|
|
{
|
|
const char *sep = "";
|
|
struct reggroup *group;
|
|
|
|
for (group = reggroup_next (m_gdbarch, NULL);
|
|
group != NULL;
|
|
group = reggroup_next (m_gdbarch, group))
|
|
{
|
|
if (gdbarch_register_reggroup_p (m_gdbarch, regnum, group))
|
|
{
|
|
fprintf_unfiltered (file,
|
|
"%s%s", sep, reggroup_name (group));
|
|
sep = ",";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
enum regcache_dump_what
|
|
{
|
|
regcache_dump_none, regcache_dump_raw,
|
|
regcache_dump_cooked, regcache_dump_groups,
|
|
regcache_dump_remote
|
|
};
|
|
|
|
static void
|
|
regcache_print (const char *args, enum regcache_dump_what what_to_dump)
|
|
{
|
|
/* Where to send output. */
|
|
stdio_file file;
|
|
ui_file *out;
|
|
|
|
if (args == NULL)
|
|
out = gdb_stdout;
|
|
else
|
|
{
|
|
if (!file.open (args, "w"))
|
|
perror_with_name (_("maintenance print architecture"));
|
|
out = &file;
|
|
}
|
|
|
|
std::unique_ptr<register_dump> dump;
|
|
std::unique_ptr<regcache> regs;
|
|
gdbarch *gdbarch;
|
|
|
|
if (target_has_registers)
|
|
gdbarch = get_current_regcache ()->arch ();
|
|
else
|
|
gdbarch = target_gdbarch ();
|
|
|
|
switch (what_to_dump)
|
|
{
|
|
case regcache_dump_none:
|
|
dump.reset (new register_dump_none (gdbarch));
|
|
break;
|
|
case regcache_dump_remote:
|
|
dump.reset (new register_dump_remote (gdbarch));
|
|
break;
|
|
case regcache_dump_groups:
|
|
dump.reset (new register_dump_groups (gdbarch));
|
|
break;
|
|
case regcache_dump_raw:
|
|
case regcache_dump_cooked:
|
|
{
|
|
auto dump_pseudo = (what_to_dump == regcache_dump_cooked);
|
|
|
|
if (target_has_registers)
|
|
dump.reset (new register_dump_regcache (get_current_regcache (),
|
|
dump_pseudo));
|
|
else
|
|
{
|
|
/* For the benefit of "maint print registers" & co when
|
|
debugging an executable, allow dumping a regcache even when
|
|
there is no thread selected / no registers. */
|
|
dump.reset (new register_dump_reg_buffer (target_gdbarch (),
|
|
dump_pseudo));
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
|
|
dump->dump (out);
|
|
}
|
|
|
|
static void
|
|
maintenance_print_registers (const char *args, int from_tty)
|
|
{
|
|
regcache_print (args, regcache_dump_none);
|
|
}
|
|
|
|
static void
|
|
maintenance_print_raw_registers (const char *args, int from_tty)
|
|
{
|
|
regcache_print (args, regcache_dump_raw);
|
|
}
|
|
|
|
static void
|
|
maintenance_print_cooked_registers (const char *args, int from_tty)
|
|
{
|
|
regcache_print (args, regcache_dump_cooked);
|
|
}
|
|
|
|
static void
|
|
maintenance_print_register_groups (const char *args, int from_tty)
|
|
{
|
|
regcache_print (args, regcache_dump_groups);
|
|
}
|
|
|
|
static void
|
|
maintenance_print_remote_registers (const char *args, int from_tty)
|
|
{
|
|
regcache_print (args, regcache_dump_remote);
|
|
}
|
|
|
|
void
|
|
_initialize_regcache_dump (void)
|
|
{
|
|
add_cmd ("registers", class_maintenance, maintenance_print_registers,
|
|
_("Print the internal register configuration.\n"
|
|
"Takes an optional file parameter."), &maintenanceprintlist);
|
|
add_cmd ("raw-registers", class_maintenance,
|
|
maintenance_print_raw_registers,
|
|
_("Print the internal register configuration "
|
|
"including raw values.\n"
|
|
"Takes an optional file parameter."), &maintenanceprintlist);
|
|
add_cmd ("cooked-registers", class_maintenance,
|
|
maintenance_print_cooked_registers,
|
|
_("Print the internal register configuration "
|
|
"including cooked values.\n"
|
|
"Takes an optional file parameter."), &maintenanceprintlist);
|
|
add_cmd ("register-groups", class_maintenance,
|
|
maintenance_print_register_groups,
|
|
_("Print the internal register configuration "
|
|
"including each register's group.\n"
|
|
"Takes an optional file parameter."),
|
|
&maintenanceprintlist);
|
|
add_cmd ("remote-registers", class_maintenance,
|
|
maintenance_print_remote_registers, _("\
|
|
Print the internal register configuration including remote register number "
|
|
"and g/G packets offset.\n\
|
|
Takes an optional file parameter."),
|
|
&maintenanceprintlist);
|
|
}
|