mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
0743fc83c0
Currently there are many prefix commands that do nothing but call either help_list or cmd_show_list. I happened to notice that one such call, for "set print type", used the wrong command list parameter, causing incorrect output. Rather than fix this bug in isolation, I decided to eliminate this possibility by adding two new ways to add prefix commands, which simply route the call to help_list or cmd_show_list, as appropriate. This makes it impossible for a mismatch to occur. In some cases, a bit of output was removed; however, I don't think this output in general was very useful. It seemed redundant with what's already printed by help_list. A representative example is this hunk, removed from ada-lang.c: - printf_unfiltered (_(\ -"\"set ada\" must be followed by the name of a setting.\n")); This simplified the CLI style set/show commands quite a bit, and allowed the deletion of a macro. This also cleans up some unusual code in windows-tdep.c. Tested on x86-64 Fedora 30. Note that I have no way to build the go32-nat.c change. gdb/ChangeLog 2020-04-17 Tom Tromey <tromey@adacore.com> * auto-load.c (show_auto_load_cmd): Remove. (auto_load_show_cmdlist_get): Use add_show_prefix_cmd. * arc-tdep.c (_initialize_arc_tdep): Use add_show_prefix_cmd. (maintenance_print_arc_command): Remove. * tui/tui-win.c (tui_command): Remove. (tui_get_cmd_list): Use add_basic_prefix_cmd. * tui/tui-layout.c (tui_layout_command): Remove. (_initialize_tui_layout): Use add_basic_prefix_cmd. * python/python.c (user_set_python, user_show_python): Remove. (_initialize_python): Use add_basic_prefix_cmd, add_show_prefix_cmd. * guile/guile.c (set_guile_command, show_guile_command): Remove. (install_gdb_commands): Use add_basic_prefix_cmd, add_show_prefix_cmd. (info_guile_command): Remove. * dwarf2/read.c (set_dwarf_cmd, show_dwarf_cmd): Remove. (_initialize_dwarf2_read): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cli/cli-style.h (class cli_style_option) <add_setshow_commands>: Remove do_set and do_show parameters. * cli/cli-style.c (set_style, show_style): Remove. (_initialize_cli_style): Use add_basic_prefix_cmd, add_show_prefix_cmd. (cli_style_option::add_setshow_commands): Remove do_set and do_show parameters. (cli_style_option::add_setshow_commands): Use add_basic_prefix_cmd, add_show_prefix_cmd. (STYLE_ADD_SETSHOW_COMMANDS): Remove macro. (set_style_name): Remove. * cli/cli-dump.c (dump_command, append_command): Remove. (srec_dump_command, ihex_dump_command, verilog_dump_command) (tekhex_dump_command, binary_dump_command) (binary_append_command): Remove. (_initialize_cli_dump): Use add_basic_prefix_cmd. * windows-tdep.c (w32_prefix_command_valid): Remove global. (init_w32_command_list): Remove; move into ... (_initialize_windows_tdep): ... here. Use add_basic_prefix_cmd. * valprint.c (set_print, show_print, set_print_raw) (show_print_raw): Remove. (_initialize_valprint): Use add_basic_prefix_cmd, add_show_prefix_cmd. * typeprint.c (set_print_type, show_print_type): Remove. (_initialize_typeprint): Use add_basic_prefix_cmd, add_show_prefix_cmd. * record.c (set_record_command, show_record_command): Remove. (_initialize_record): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cli/cli-cmds.c (_initialize_cli_cmds): Use add_basic_prefix_cmd, add_show_prefix_cmd. (info_command, show_command, set_debug, show_debug): Remove. * top.h (set_history, show_history): Don't declare. * top.c (set_history, show_history): Remove. * target-descriptions.c (set_tdesc_cmd, show_tdesc_cmd) (unset_tdesc_cmd): Remove. (_initialize_target_descriptions): Use add_basic_prefix_cmd, add_show_prefix_cmd. * symtab.c (info_module_command): Remove. (_initialize_symtab): Use add_basic_prefix_cmd. * symfile.c (overlay_command): Remove. (_initialize_symfile): Use add_basic_prefix_cmd. * sparc64-tdep.c (info_adi_command): Remove. (_initialize_sparc64_adi_tdep): Use add_basic_prefix_cmd. * sh-tdep.c (show_sh_command, set_sh_command): Remove. (_initialize_sh_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * serial.c (serial_set_cmd, serial_show_cmd): Remove. (_initialize_serial): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ser-tcp.c (set_tcp_cmd, show_tcp_cmd): Remove. (_initialize_ser_tcp): Use add_basic_prefix_cmd, add_show_prefix_cmd. * rs6000-tdep.c (set_powerpc_command, show_powerpc_command) (_initialize_rs6000_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * riscv-tdep.c (show_riscv_command, set_riscv_command) (show_debug_riscv_command, set_debug_riscv_command): Remove. (_initialize_riscv_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * remote.c (remote_command, set_remote_cmd): Remove. (_initialize_remote): Use add_basic_prefix_cmd. * record-full.c (set_record_full_command) (show_record_full_command): Remove. (_initialize_record_full): Use add_basic_prefix_cmd, add_show_prefix_cmd. * record-btrace.c (cmd_set_record_btrace) (cmd_show_record_btrace, cmd_set_record_btrace_bts) (cmd_show_record_btrace_bts, cmd_set_record_btrace_pt) (cmd_show_record_btrace_pt): Remove. (_initialize_record_btrace): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ravenscar-thread.c (set_ravenscar_command) (show_ravenscar_command): Remove. (_initialize_ravenscar): Use add_basic_prefix_cmd, add_show_prefix_cmd. * mips-tdep.c (show_mips_command, set_mips_command) (_initialize_mips_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * maint.c (maintenance_command, maintenance_info_command) (maintenance_check_command, maintenance_print_command) (maintenance_set_cmd, maintenance_show_cmd): Remove. (_initialize_maint_cmds): Use add_basic_prefix_cmd, add_show_prefix_cmd. (show_per_command_cmd): Remove. * maint-test-settings.c (maintenance_set_test_settings_cmd): Remove. (maintenance_show_test_settings_cmd): Remove. (_initialize_maint_test_settings): Use add_basic_prefix_cmd, add_show_prefix_cmd. * maint-test-options.c (maintenance_test_options_command): Remove. (_initialize_maint_test_options): Use add_basic_prefix_cmd. * macrocmd.c (macro_command): Remove (_initialize_macrocmd): Use add_basic_prefix_cmd. * language.c (set_check, show_check): Remove. (_initialize_language): Use add_basic_prefix_cmd, add_show_prefix_cmd. * infcmd.c (unset_command): Remove. (_initialize_infcmd): Use add_basic_prefix_cmd. * i386-tdep.c (set_mpx_cmd, show_mpx_cmd): Remove. (_initialize_i386_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * go32-nat.c (go32_info_dos_command): Remove. (_initialize_go32_nat): Use add_basic_prefix_cmd. * cli/cli-decode.c (do_prefix_cmd, add_basic_prefix_cmd) (do_show_prefix_cmd, add_show_prefix_cmd): New functions. * frame.c (set_backtrace_cmd, show_backtrace_cmd): Remove. (_initialize_frame): Use add_basic_prefix_cmd, add_show_prefix_cmd. * dcache.c (set_dcache_command, show_dcache_command): Remove. (_initialize_dcache): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cp-support.c (maint_cplus_command): Remove. (_initialize_cp_support): Use add_basic_prefix_cmd. * btrace.c (maint_btrace_cmd, maint_btrace_set_cmd) (maint_btrace_show_cmd, maint_btrace_pt_set_cmd) (maint_btrace_pt_show_cmd, _initialize_btrace): Use add_basic_prefix_cmd, add_show_prefix_cmd. * breakpoint.c (save_command): Remove. (_initialize_breakpoint): Use add_basic_prefix_cmd. * arm-tdep.c (set_arm_command, show_arm_command): Remove. (_initialize_arm_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ada-lang.c (maint_set_ada_cmd, maint_show_ada_cmd) (set_ada_command, show_ada_command): Remove. (_initialize_ada_language): Use add_basic_prefix_cmd, add_show_prefix_cmd. * command.h (add_basic_prefix_cmd, add_show_prefix_cmd): Declare. gdb/testsuite/ChangeLog 2020-04-17 Tom Tromey <tromey@adacore.com> * gdb.cp/maint.exp (test_help): Simplify multiple_help_body. Update tests. * gdb.btrace/cpu.exp: Update tests. * gdb.base/maint.exp: Update tests. * gdb.base/default.exp: Update tests. * gdb.base/completion.exp: Update tests.
298 lines
9.5 KiB
C++
298 lines
9.5 KiB
C++
/* Top level stuff for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1986-2020 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/>. */
|
|
|
|
#ifndef TOP_H
|
|
#define TOP_H
|
|
|
|
#include "gdbsupport/buffer.h"
|
|
#include "gdbsupport/event-loop.h"
|
|
#include "value.h"
|
|
|
|
struct tl_interp_info;
|
|
|
|
/* Prompt state. */
|
|
|
|
enum prompt_state
|
|
{
|
|
/* The command line is blocked simulating synchronous execution.
|
|
This is used to implement the foreground execution commands
|
|
('run', 'continue', etc.). We won't display the prompt and
|
|
accept further commands until the execution is actually over. */
|
|
PROMPT_BLOCKED,
|
|
|
|
/* The command finished; display the prompt before returning back to
|
|
the top level. */
|
|
PROMPT_NEEDED,
|
|
|
|
/* We've displayed the prompt already, ready for input. */
|
|
PROMPTED,
|
|
};
|
|
|
|
/* All about a user interface instance. Each user interface has its
|
|
own I/O files/streams, readline state, its own top level
|
|
interpreter (for the main UI, this is the interpreter specified
|
|
with -i on the command line) and secondary interpreters (for
|
|
interpreter-exec ...), etc. There's always one UI associated with
|
|
stdin/stdout/stderr, but the user can create secondary UIs, for
|
|
example, to create a separate MI channel on its own stdio
|
|
streams. */
|
|
|
|
struct ui
|
|
{
|
|
/* Create a new UI. */
|
|
ui (FILE *instream, FILE *outstream, FILE *errstream);
|
|
~ui ();
|
|
|
|
DISABLE_COPY_AND_ASSIGN (ui);
|
|
|
|
/* Pointer to next in singly-linked list. */
|
|
struct ui *next;
|
|
|
|
/* Convenient handle (UI number). Unique across all UIs. */
|
|
int num;
|
|
|
|
/* The UI's command line buffer. This is to used to accumulate
|
|
input until we have a whole command line. */
|
|
struct buffer line_buffer;
|
|
|
|
/* The callback used by the event loop whenever an event is detected
|
|
on the UI's input file descriptor. This function incrementally
|
|
builds a buffer where it accumulates the line read up to the
|
|
point of invocation. In the special case in which the character
|
|
read is newline, the function invokes the INPUT_HANDLER callback
|
|
(see below). */
|
|
void (*call_readline) (gdb_client_data);
|
|
|
|
/* The function to invoke when a complete line of input is ready for
|
|
processing. */
|
|
void (*input_handler) (gdb::unique_xmalloc_ptr<char> &&);
|
|
|
|
/* True if this UI is using the readline library for command
|
|
editing; false if using GDB's own simple readline emulation, with
|
|
no editing support. */
|
|
int command_editing;
|
|
|
|
/* Each UI has its own independent set of interpreters. */
|
|
struct ui_interp_info *interp_info;
|
|
|
|
/* True if the UI is in async mode, false if in sync mode. If in
|
|
sync mode, a synchronous execution command (e.g, "next") does not
|
|
return until the command is finished. If in async mode, then
|
|
running a synchronous command returns right after resuming the
|
|
target. Waiting for the command's completion is later done on
|
|
the top event loop. For the main UI, this starts out disabled,
|
|
until all the explicit command line arguments (e.g., `gdb -ex
|
|
"start" -ex "next"') are processed. */
|
|
int async;
|
|
|
|
/* The number of nested readline secondary prompts that are
|
|
currently active. */
|
|
int secondary_prompt_depth;
|
|
|
|
/* The UI's stdin. Set to stdin for the main UI. */
|
|
FILE *stdin_stream;
|
|
|
|
/* stdio stream that command input is being read from. Set to stdin
|
|
normally. Set by source_command to the file we are sourcing.
|
|
Set to NULL if we are executing a user-defined command or
|
|
interacting via a GUI. */
|
|
FILE *instream;
|
|
/* Standard output stream. */
|
|
FILE *outstream;
|
|
/* Standard error stream. */
|
|
FILE *errstream;
|
|
|
|
/* The file descriptor for the input stream, so that we can register
|
|
it with the event loop. */
|
|
int input_fd;
|
|
|
|
/* Whether ISATTY returns true on input_fd. Cached here because
|
|
quit_force needs to know this _after_ input_fd might be
|
|
closed. */
|
|
int input_interactive_p;
|
|
|
|
/* See enum prompt_state's description. */
|
|
enum prompt_state prompt_state;
|
|
|
|
/* The fields below that start with "m_" are "private". They're
|
|
meant to be accessed through wrapper macros that make them look
|
|
like globals. */
|
|
|
|
/* The ui_file streams. */
|
|
/* Normal results */
|
|
struct ui_file *m_gdb_stdout;
|
|
/* Input stream */
|
|
struct ui_file *m_gdb_stdin;
|
|
/* Serious error notifications */
|
|
struct ui_file *m_gdb_stderr;
|
|
/* Log/debug/trace messages that should bypass normal stdout/stderr
|
|
filtering. For moment, always call this stream using
|
|
*_unfiltered. In the very near future that restriction shall be
|
|
removed - either call shall be unfiltered. (cagney 1999-06-13). */
|
|
struct ui_file *m_gdb_stdlog;
|
|
|
|
/* The current ui_out. */
|
|
struct ui_out *m_current_uiout;
|
|
};
|
|
|
|
/* The main UI. This is the UI that is bound to stdin/stdout/stderr.
|
|
It always exists and is created automatically when GDB starts
|
|
up. */
|
|
extern struct ui *main_ui;
|
|
|
|
/* The current UI. */
|
|
extern struct ui *current_ui;
|
|
|
|
/* The list of all UIs. */
|
|
extern struct ui *ui_list;
|
|
|
|
/* State for SWITCH_THRU_ALL_UIS. */
|
|
class switch_thru_all_uis
|
|
{
|
|
public:
|
|
|
|
switch_thru_all_uis () : m_iter (ui_list), m_save_ui (¤t_ui)
|
|
{
|
|
current_ui = ui_list;
|
|
}
|
|
|
|
/* If done iterating, return true; otherwise return false. */
|
|
bool done () const
|
|
{
|
|
return m_iter == NULL;
|
|
}
|
|
|
|
/* Move to the next UI, setting current_ui if iteration is not yet
|
|
complete. */
|
|
void next ()
|
|
{
|
|
m_iter = m_iter->next;
|
|
if (m_iter != NULL)
|
|
current_ui = m_iter;
|
|
}
|
|
|
|
private:
|
|
|
|
/* No need for these. They are intentionally not defined
|
|
anywhere. */
|
|
switch_thru_all_uis &operator= (const switch_thru_all_uis &);
|
|
switch_thru_all_uis (const switch_thru_all_uis &);
|
|
|
|
/* Used to iterate through the UIs. */
|
|
struct ui *m_iter;
|
|
|
|
/* Save and restore current_ui. */
|
|
scoped_restore_tmpl<struct ui *> m_save_ui;
|
|
};
|
|
|
|
/* Traverse through all UI, and switch the current UI to the one
|
|
being iterated. */
|
|
#define SWITCH_THRU_ALL_UIS() \
|
|
for (switch_thru_all_uis stau_state; !stau_state.done (); stau_state.next ())
|
|
|
|
/* Traverse over all UIs. */
|
|
#define ALL_UIS(UI) \
|
|
for (UI = ui_list; UI; UI = UI->next) \
|
|
|
|
/* Register the UI's input file descriptor in the event loop. */
|
|
extern void ui_register_input_event_handler (struct ui *ui);
|
|
|
|
/* Unregister the UI's input file descriptor from the event loop. */
|
|
extern void ui_unregister_input_event_handler (struct ui *ui);
|
|
|
|
/* From top.c. */
|
|
extern bool confirm;
|
|
extern int inhibit_gdbinit;
|
|
|
|
/* Print the GDB version banner to STREAM. If INTERACTIVE is false,
|
|
then information referring to commands (e.g., "show configuration")
|
|
is omitted; this mode is used for the --version command line
|
|
option. If INTERACTIVE is true, then interactive commands are
|
|
mentioned. */
|
|
extern void print_gdb_version (struct ui_file *stream, bool interactive);
|
|
|
|
extern void print_gdb_configuration (struct ui_file *);
|
|
|
|
extern void read_command_file (FILE *);
|
|
extern void init_history (void);
|
|
extern void command_loop (void);
|
|
extern int quit_confirm (void);
|
|
extern void quit_force (int *, int);
|
|
extern void quit_command (const char *, int);
|
|
extern void quit_cover (void);
|
|
extern void execute_command (const char *, int);
|
|
|
|
/* If the interpreter is in sync mode (we're running a user command's
|
|
list, running command hooks or similars), and we just ran a
|
|
synchronous command that started the target, wait for that command
|
|
to end. WAS_SYNC indicates whether sync_execution was set before
|
|
the command was run. */
|
|
|
|
extern void maybe_wait_sync_command_done (int was_sync);
|
|
|
|
/* Wait for a synchronous execution command to end. */
|
|
extern void wait_sync_command_done (void);
|
|
|
|
extern void check_frame_language_change (void);
|
|
|
|
/* Prepare for execution of a command.
|
|
Call this before every command, CLI or MI.
|
|
Returns a cleanup to be run after the command is completed. */
|
|
extern scoped_value_mark prepare_execute_command (void);
|
|
|
|
/* This function returns a pointer to the string that is used
|
|
by gdb for its command prompt. */
|
|
extern char *get_prompt (void);
|
|
|
|
/* This function returns a pointer to the string that is used
|
|
by gdb for its command prompt. */
|
|
extern void set_prompt (const char *s);
|
|
|
|
/* Return 1 if UI's current input handler is a secondary prompt, 0
|
|
otherwise. */
|
|
|
|
extern int gdb_in_secondary_prompt_p (struct ui *ui);
|
|
|
|
/* From random places. */
|
|
extern int readnow_symbol_files;
|
|
extern int readnever_symbol_files;
|
|
|
|
/* Perform _initialize initialization. */
|
|
extern void gdb_init (char *);
|
|
|
|
/* For use by event-top.c. */
|
|
/* Variables from top.c. */
|
|
extern int source_line_number;
|
|
extern std::string source_file_name;
|
|
extern bool history_expansion_p;
|
|
extern int server_command;
|
|
extern char *lim_at_start;
|
|
|
|
extern void gdb_add_history (const char *);
|
|
|
|
extern void show_commands (const char *args, int from_tty);
|
|
|
|
extern void set_verbose (const char *, int, struct cmd_list_element *);
|
|
|
|
extern char *handle_line_of_input (struct buffer *cmd_line_buffer,
|
|
const char *rl, int repeat,
|
|
const char *annotation_suffix);
|
|
|
|
#endif
|