diff options
| -rw-r--r-- | gdb/ChangeLog | 39 | ||||
| -rw-r--r-- | gdb/NEWS | 4 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 43 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-decode.c | 9 | ||||
| -rw-r--r-- | gdb/defs.h | 3 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 7 | ||||
| -rw-r--r-- | gdb/f-valprint.c | 3 | ||||
| -rw-r--r-- | gdb/guile/scm-cmd.c | 2 | ||||
| -rw-r--r-- | gdb/infcmd.c | 55 | ||||
| -rw-r--r-- | gdb/infrun.c | 91 | ||||
| -rw-r--r-- | gdb/main.c | 5 | ||||
| -rw-r--r-- | gdb/python/py-cmd.c | 2 | ||||
| -rw-r--r-- | gdb/source.c | 16 | ||||
| -rw-r--r-- | gdb/stack.c | 42 | ||||
| -rw-r--r-- | gdb/symtab.c | 8 | ||||
| -rw-r--r-- | gdb/thread.c | 3 | ||||
| -rw-r--r-- | gdb/tui/tui-layout.c | 58 | ||||
| -rw-r--r-- | gdb/tui/tui-regs.c | 30 | ||||
| -rw-r--r-- | gdb/tui/tui-win.c | 46 | ||||
| -rw-r--r-- | gdb/utils.c | 20 |
22 files changed, 53 insertions, 444 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 73f8610..8a14194e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,42 @@ +2015-04-11 Jan Kratochvil <jan.kratochvil@redhat.com> + + * NEWS (Changes since GDB 7.9): Add removed -xdb. + * breakpoint.c (command_line_is_silent): Remove xdb_commands + conditional. + (_initialize_breakpoint): Remove xdb_commands for bc, ab, sb, db, ba + and lb. + * cli/cli-cmds.c (_initialize_cli_cmds): Remove xdb_commands for v and + va. + * cli/cli-decode.c (find_command_name_length): Remove xdb_commands + conditional. + * defs.h (xdb_commands): Remove declaration. + * f-valprint.c (_initialize_f_valprint): Remove xdb_commands for lc. + * guile/scm-cmd.c (command_classes): Remove xdb from comment. + * infcmd.c (run_no_args_command, go_command): Remove. + (_initialize_infcmd): Remove xdb_commands for S, go, g, R and lr. + * infrun.c (xdb_handle_command): Remove. + (_initialize_infrun): Remove xdb_commands for lz and z. + * main.c (xdb_commands): Remove variable. + (captured_main): Remove "xdb" from long_options. + (print_gdb_help): Remove --xdb from help. + * python/py-cmd.c (gdbpy_initialize_commands): Remove xdb from comment. + * source.c (_initialize_source): Remove xdb_commands for D, ld, / and ?. + * stack.c (backtrace_full_command, args_plus_locals_info) + (current_frame_command): Remove. + (_initialize_stack): Remove xdb_commands for t, T and l. + * symtab.c (_initialize_symtab): Remove xdb_commands for lf and lg. + * thread.c (_initialize_thread): Remove xdb_commands condition. + * tui/tui-layout.c (tui_toggle_layout_command) + (tui_toggle_split_layout_command, tui_handle_xdb_layout): Remove. + (_initialize_tui_layout): Remove xdb_commands for td and ts. + * tui/tui-regs.c (tui_scroll_regs_forward_command) + (tui_scroll_regs_backward_command): Remove. + (_initialize_tui_regs): Remove xdb_commands for fr, gr, sr, +r and -r. + * tui/tui-win.c (tui_xdb_set_win_height_command): Remove. + (_initialize_tui_win): Remove xdb_commands for U and w. + * utils.c (pagination_on_command, pagination_off_command): Remove. + (initialize_utils): Remove xdb_commands for am and sm. + 2015-04-10 Pedro Alves <palves@redhat.com> * infrun.c (displaced_step_fixup): Switch to the event ptid @@ -112,6 +112,10 @@ vFile:fstat: * GDB now supports access to vector registers on S/390 GNU/Linux targets. +* Removed command line options + +-xdb HP-UX XDB compatibility mode. + * Removed targets and native configurations HP/PA running HP-UX hppa*-*-hpux* diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 12955cb..31869f1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4571,8 +4571,7 @@ cleanup_executing_breakpoints (void *ignore) static int command_line_is_silent (struct command_line *cmd) { - return cmd && (strcmp ("silent", cmd->line) == 0 - || (xdb_commands && strcmp ("Q", cmd->line) == 0)); + return cmd && (strcmp ("silent", cmd->line) == 0); } /* Execute all the commands associated with all the breakpoints at @@ -15799,8 +15798,6 @@ _initialize_breakpoint (void) add_com ("ignore", class_breakpoint, ignore_command, _("\ Set ignore-count of breakpoint number N to COUNT.\n\ Usage is `ignore N COUNT'.")); - if (xdb_commands) - add_com_alias ("bc", "ignore", class_breakpoint, 1); add_com ("commands", class_breakpoint, commands_command, _("\ Set commands to be executed when a breakpoint is hit.\n\ @@ -15849,13 +15846,6 @@ With no subcommand, breakpoints are enabled until you command otherwise.\n\ This is used to cancel the effect of the \"disable\" command.\n\ With a subcommand you can enable temporarily."), &enablelist, "enable ", 1, &cmdlist); - if (xdb_commands) - add_com ("ab", class_breakpoint, enable_command, _("\ -Enable some breakpoints.\n\ -Give breakpoint numbers (separated by spaces) as arguments.\n\ -With no subcommand, breakpoints are enabled until you command otherwise.\n\ -This is used to cancel the effect of the \"disable\" command.\n\ -With a subcommand you can enable temporarily.")); add_com_alias ("en", "enable", class_breakpoint, 1); @@ -15906,12 +15896,6 @@ A disabled breakpoint is not forgotten, but has no effect until re-enabled."), &disablelist, "disable ", 1, &cmdlist); add_com_alias ("dis", "disable", class_breakpoint, 1); add_com_alias ("disa", "disable", class_breakpoint, 1); - if (xdb_commands) - add_com ("sb", class_breakpoint, disable_command, _("\ -Disable some breakpoints.\n\ -Arguments are breakpoint numbers with spaces in between.\n\ -To disable all breakpoints, give no argument.\n\ -A disabled breakpoint is not forgotten, but has no effect until re-enabled.")); add_cmd ("breakpoints", class_alias, disable_command, _("\ Disable some breakpoints.\n\ @@ -15931,11 +15915,6 @@ The \"unset\" command is also an alias for \"delete\"."), &deletelist, "delete ", 1, &cmdlist); add_com_alias ("d", "delete", class_breakpoint, 1); add_com_alias ("del", "delete", class_breakpoint, 1); - if (xdb_commands) - add_com ("db", class_breakpoint, delete_command, _("\ -Delete some breakpoints.\n\ -Arguments are breakpoint numbers with spaces in between.\n\ -To delete all breakpoints, give no argument.\n")); add_cmd ("breakpoints", class_alias, delete_command, _("\ Delete some breakpoints or auto-display expressions.\n\ @@ -15967,9 +15946,6 @@ BREAK_ARGS_HELP ("break"))); add_com_alias ("bre", "break", class_run, 1); add_com_alias ("brea", "break", class_run, 1); - if (xdb_commands) - add_com_alias ("ba", "break", class_breakpoint, 1); - if (dbx_commands) { add_abbrev_prefix_cmd ("stop", class_breakpoint, stop_command, _("\ @@ -16014,23 +15990,6 @@ breakpoint set.")); add_info_alias ("b", "breakpoints", 1); - if (xdb_commands) - add_com ("lb", class_breakpoint, breakpoints_info, _("\ -Status of user-settable breakpoints, or breakpoint number NUMBER.\n\ -The \"Type\" column indicates one of:\n\ -\tbreakpoint - normal breakpoint\n\ -\twatchpoint - watchpoint\n\ -The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\ -the disposition of the breakpoint after it gets hit. \"dis\" means that the\n\ -breakpoint will be disabled. The \"Address\" and \"What\" columns indicate the\n\ -address and file/line number respectively.\n\ -\n\ -Convenience variable \"$_\" and default examine address for \"x\"\n\ -are set to the address of the last breakpoint listed unless the command\n\ -is prefixed with \"server \".\n\n\ -Convenience variable \"$bpnum\" contains the number of the last\n\ -breakpoint set.")); - add_cmd ("breakpoints", class_maintenance, maintenance_info_breakpoints, _("\ Status of all breakpoints, or breakpoint number NUMBER.\n\ The \"Type\" column indicates one of:\n\ diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index e46f036..2ec2dd3 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1846,10 +1846,7 @@ Lines can be specified in these ways:\n\ With two args if one is empty it stands for ten lines away from \ the other arg.")); - if (!xdb_commands) - add_com_alias ("l", "list", class_files, 1); - else - add_com_alias ("v", "list", class_files, 1); + add_com_alias ("l", "list", class_files, 1); if (dbx_commands) add_com_alias ("file", "list", class_files, 1); @@ -1868,8 +1865,6 @@ like in the \"break\" command.\n\ So, for example, if you want to disassemble function bar in file foo.c\n\ you must type \"disassemble 'foo.c'::bar\" and not \"disassemble foo.c:bar\".")); set_cmd_completer (c, location_completer); - if (xdb_commands) - add_com_alias ("va", "disassemble", class_xdb, 0); add_com_alias ("!", "shell", class_support, 0); diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 2ee2ae0..4d0d5a9 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -1248,11 +1248,6 @@ find_command_name_length (const char *text) /* Some characters are only used for TUI specific commands. However, they are always allowed for the sake of consistency. - The XDB compatibility characters are only allowed when using the - right mode because they clash with other GDB commands - - specifically '/' is used as a suffix for print, examine and - display. - Note that this is larger than the character set allowed when creating user-defined commands. */ @@ -1263,9 +1258,7 @@ find_command_name_length (const char *text) while (isalnum (*p) || *p == '-' || *p == '_' /* Characters used by TUI specific commands. */ - || *p == '+' || *p == '<' || *p == '>' || *p == '$' - /* Characters used for XDB compatibility. */ - || (xdb_commands && (*p == '/' || *p == '?'))) + || *p == '+' || *p == '<' || *p == '>' || *p == '$') p++; return p - text; @@ -100,9 +100,6 @@ enum compile_i_scope_types #define max(a, b) ((a) > (b) ? (a) : (b)) #endif -/* * Enable xdb commands if set. */ -extern int xdb_commands; - /* * Enable dbx commands if set. */ extern int dbx_commands; diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index aed1203..3eb18f5 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2015-04-11 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.texinfo (Mode Options): Remove -xdb. + 2015-04-10 Jan Kratochvil <jan.kratochvil@redhat.com> Eli Zaretskii <eliz@gnu.org> diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 419439a..6255c14 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -1235,13 +1235,6 @@ source, assembly, registers and @value{GDBN} command outputs option if you run @value{GDBN} from Emacs (@pxref{Emacs, , Using @value{GDBN} under @sc{gnu} Emacs}). -@c @item -xdb -@c @cindex @code{--xdb} -@c Run in XDB compatibility mode, allowing the use of certain XDB commands. -@c For information, see the file @file{xdb_trans.html}, which is usually -@c installed in the directory @code{/opt/langtools/wdb/doc} on HP-UX -@c systems. - @item -interpreter @var{interp} @cindex @code{--interpreter} Use the interpreter @var{interp} for interface with the controlling diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index e841edf..8d74f03 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -516,7 +516,4 @@ _initialize_f_valprint (void) { add_info ("common", info_common_command, _("Print out the values contained in a Fortran COMMON block.")); - if (xdb_commands) - add_com ("lc", class_info, info_common_command, - _("Print out the values contained in a Fortran COMMON block.")); } diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index 202721b..a693df2 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -556,7 +556,7 @@ gdbscm_parse_command_name (const char *name, static const scheme_integer_constant command_classes[] = { /* Note: alias and user are special; pseudo appears to be unused, - and there is no reason to expose tui or xdb, I think. */ + and there is no reason to expose tui, I think. */ { "COMMAND_NONE", no_class }, { "COMMAND_RUNNING", class_run }, { "COMMAND_DATA", class_vars }, diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 1c70675..6caa878 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -100,10 +100,6 @@ static void step_command (char *, int); static void run_command (char *, int); -static void run_no_args_command (char *args, int from_tty); - -static void go_command (char *line_no, int from_tty); - void _initialize_infcmd (void); #define ERROR_NO_INFERIOR \ @@ -647,13 +643,6 @@ run_command (char *args, int from_tty) run_command_1 (args, from_tty, 0); } -static void -run_no_args_command (char *args, int from_tty) -{ - set_inferior_args (""); -} - - /* Start the execution of the program up until the beginning of the main program. */ @@ -1237,22 +1226,6 @@ jump_command (char *arg, int from_tty) proceed (addr, GDB_SIGNAL_0); } - -/* Go to line or address in current procedure. */ - -static void -go_command (char *line_no, int from_tty) -{ - if (line_no == (char *) NULL || !*line_no) - printf_filtered (_("Usage: go <location>\n")); - else - { - tbreak_command (line_no, from_tty); - jump_command (line_no, from_tty); - } -} - - /* Continue program giving it specified signal. */ static void @@ -3173,8 +3146,6 @@ Unlike \"step\", if the current source line calls a subroutine,\n\ this command does not enter the subroutine, but instead steps over\n\ the call, in effect treating it as a single source line.")); add_com_alias ("n", "next", class_run, 1); - if (xdb_commands) - add_com_alias ("S", "next", class_run, 1); add_com ("step", class_run, step_command, _("\ Step program until it reaches a different source line.\n\ @@ -3204,21 +3175,6 @@ for an address to start at.")); set_cmd_completer (c, location_completer); add_com_alias ("j", "jump", class_run, 1); - if (xdb_commands) - { - c = add_com ("go", class_run, go_command, _("\ -Usage: go <location>\n\ -Continue program being debugged, stopping at specified line or \n\ -address.\n\ -Give as argument either LINENUM or *ADDR, where ADDR is an \n\ -expression for an address to start at.\n\ -This command is a combination of tbreak and jump.")); - set_cmd_completer (c, location_completer); - } - - if (xdb_commands) - add_com_alias ("g", "go", class_run, 1); - add_com ("continue", class_run, continue_command, _("\ Continue program being debugged, after signal or breakpoint.\n\ Usage: continue [N]\n\ @@ -3244,9 +3200,6 @@ To cancel previous arguments and run with no arguments,\n\ use \"set args\" without arguments.")); set_cmd_completer (c, filename_completer); add_com_alias ("r", "run", class_run, 1); - if (xdb_commands) - add_com ("R", class_run, run_no_args_command, - _("Start debugged program with no arguments.")); c = add_com ("start", class_run, start_command, _("\ Run the debugged program until the beginning of the main procedure.\n\ @@ -3266,14 +3219,6 @@ Register name as argument means describe only that register.")); add_info_alias ("r", "registers", 1); set_cmd_completer (c, reg_or_group_completer); - if (xdb_commands) - { - c = add_com ("lr", class_info, nofp_registers_info, _("\ -List of integer registers and their contents, for selected stack frame.\n\ -Register name as argument means describe only that register.")); - set_cmd_completer (c, reg_or_group_completer); - } - c = add_info ("all-registers", all_registers_info, _("\ List of all registers and their contents, for selected stack frame.\n\ Register name as argument means describe only that register.")); diff --git a/gdb/infrun.c b/gdb/infrun.c index c406183..4164a00 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -88,8 +88,6 @@ static void set_schedlock_func (char *args, int from_tty, static int currently_stepping (struct thread_info *tp); -static void xdb_handle_command (char *args, int from_tty); - void _initialize_infrun (void); void nullify_last_target_wait_ptid (void); @@ -7101,72 +7099,6 @@ handle_completer (struct cmd_list_element *ignore, return return_val; } -static void -xdb_handle_command (char *args, int from_tty) -{ - char **argv; - struct cleanup *old_chain; - - if (args == NULL) - error_no_arg (_("xdb command")); - - /* Break the command line up into args. */ - - argv = gdb_buildargv (args); - old_chain = make_cleanup_freeargv (argv); - if (argv[1] != (char *) NULL) - { - char *argBuf; - int bufLen; - - bufLen = strlen (argv[0]) + 20; - argBuf = (char *) xmalloc (bufLen); - if (argBuf) - { - int validFlag = 1; - enum gdb_signal oursig; - - oursig = gdb_signal_from_name (argv[0]); - memset (argBuf, 0, bufLen); - if (strcmp (argv[1], "Q") == 0) - sprintf (argBuf, "%s %s", argv[0], "noprint"); - else - { - if (strcmp (argv[1], "s") == 0) - { - if (!signal_stop[oursig]) - sprintf (argBuf, "%s %s", argv[0], "stop"); - else - sprintf (argBuf, "%s %s", argv[0], "nostop"); - } - else if (strcmp (argv[1], "i") == 0) - { - if (!signal_program[oursig]) - sprintf (argBuf, "%s %s", argv[0], "pass"); - else - sprintf (argBuf, "%s %s", argv[0], "nopass"); - } - else if (strcmp (argv[1], "r") == 0) - { - if (!signal_print[oursig]) - sprintf (argBuf, "%s %s", argv[0], "print"); - else - sprintf (argBuf, "%s %s", argv[0], "noprint"); - } - else - validFlag = 0; - } - if (validFlag) - handle_command (argBuf, from_tty); - else - printf_filtered (_("Invalid signal handling flag.\n")); - if (argBuf) - xfree (argBuf); - } - } - do_cleanups (old_chain); -} - enum gdb_signal gdb_signal_from_command (int num) { @@ -7749,29 +7681,6 @@ may be interspersed with actions, with the actions being performed for\n\ all signals cumulatively specified.")); set_cmd_completer (c, handle_completer); - if (xdb_commands) - { - add_com ("lz", class_info, signals_info, _("\ -What debugger does when program gets various signals.\n\ -Specify a signal as argument to print info on that signal only.")); - add_com ("z", class_run, xdb_handle_command, _("\ -Specify how to handle a signal.\n\ -Args are signals and actions to apply to those signals.\n\ -Symbolic signals (e.g. SIGSEGV) are recommended but numeric signals\n\ -from 1-15 are allowed for compatibility with old versions of GDB.\n\ -Numeric ranges may be specified with the form LOW-HIGH (e.g. 1-5).\n\ -The special arg \"all\" is recognized to mean all signals except those\n\ -used by the debugger, typically SIGTRAP and SIGINT.\n\ -Recognized actions include \"s\" (toggles between stop and nostop),\n\ -\"r\" (toggles between print and noprint), \"i\" (toggles between pass and \ -nopass), \"Q\" (noprint)\n\ -Stop means reenter debugger if this signal happens (implies print).\n\ -Print means print a message if this signal happens.\n\ -Pass means let program see this signal; otherwise program doesn't know.\n\ -Ignore is a synonym for nopass and noignore is a synonym for pass.\n\ -Pass and Stop may be combined.")); - } - if (!dbx_commands) stop_command = add_cmd ("stop", class_obscure, not_just_help_class_command, _("\ @@ -50,9 +50,6 @@ do_setshow_command will free it. */ char *interpreter_p; -/* Whether xdb commands will be handled. */ -int xdb_commands = 0; - /* Whether dbx commands will be handled. */ int dbx_commands = 0; @@ -602,7 +599,6 @@ captured_main (void *data) static struct option long_options[] = { {"tui", no_argument, 0, OPT_TUI}, - {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, {"readnow", no_argument, &readnow_symbol_files, 1}, {"r", no_argument, &readnow_symbol_files, 1}, @@ -1237,7 +1233,6 @@ Output and user interface control:\n\n\ #endif fputs_unfiltered (_("\ --dbx DBX compatibility mode.\n\ - --xdb XDB compatibility mode.\n\ -q, --quiet, --silent\n\ Do not print version number on startup.\n\n\ "), stream); diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index 017d0b6..b11fc32 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -682,7 +682,7 @@ gdbpy_initialize_commands (void) return -1; /* Note: alias and user are special; pseudo appears to be unused, - and there is no reason to expose tui or xdb, I think. */ + and there is no reason to expose tui, I think. */ if (PyModule_AddIntConstant (gdb_module, "COMMAND_NONE", no_class) < 0 || PyModule_AddIntConstant (gdb_module, "COMMAND_RUNNING", class_run) < 0 || PyModule_AddIntConstant (gdb_module, "COMMAND_DATA", class_vars) < 0 diff --git a/gdb/source.c b/gdb/source.c index 49c9d83..fbec0f1 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -2047,16 +2047,6 @@ Setting the value to an empty string sets it to $cdir:$cwd, the default."), show_directories_command, &setlist, &showlist); - if (xdb_commands) - { - add_com_alias ("D", "directory", class_files, 0); - add_cmd ("ld", no_class, show_directories_1, _("\ -Current search path for finding source files.\n\ -$cwd in the path means the current working directory.\n\ -$cdir in the path means the compilation directory of the source file."), - &cmdlist); - } - add_info ("source", source_info, _("Information about the current source file.")); @@ -2083,12 +2073,6 @@ Search backward for regular expression (see regex(3)) from last line listed.\n\ The matching line number is also stored as the value of \"$_\".")); add_com_alias ("rev", "reverse-search", class_files, 1); - if (xdb_commands) - { - add_com_alias ("/", "forward-search", class_files, 0); - add_com_alias ("?", "reverse-search", class_files, 0); - } - add_setshow_integer_cmd ("listsize", class_support, &lines_to_list, _("\ Set number of source lines gdb will list by default."), _("\ Show number of source lines gdb will list by default."), _("\ diff --git a/gdb/stack.c b/gdb/stack.c index 76a2360..eea575a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1940,13 +1940,6 @@ backtrace_command (char *arg, int from_tty) do_cleanups (old_chain); } -static void -backtrace_full_command (char *arg, int from_tty) -{ - backtrace_command_1 (arg, 1 /* show_locals */, 0, from_tty); -} - - /* Iterate over the local variables of a block B, calling CB with CB_DATA. */ @@ -2218,15 +2211,6 @@ args_info (char *ignore, int from_tty) gdb_stdout); } - -static void -args_plus_locals_info (char *ignore, int from_tty) -{ - args_info (ignore, from_tty); - locals_info (ignore, from_tty); -} - - /* Select frame FRAME. Also print the stack frame and show the source if this is the tui version. */ static void @@ -2315,14 +2299,6 @@ frame_command (char *level_exp, int from_tty) print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } -/* The XDB Compatibility command to print the current frame. */ - -static void -current_frame_command (char *level_exp, int from_tty) -{ - print_stack_frame (get_selected_frame (_("No stack.")), 1, SRC_AND_LOC, 1); -} - /* Select the frame up one or COUNT_EXP stack levels from the previously selected frame, and print it briefly. */ @@ -2670,12 +2646,6 @@ a command file or a user-defined command.")); add_com_alias ("f", "frame", class_stack, 1); - if (xdb_commands) - { - add_com ("L", class_stack, current_frame_command, - _("Print the current stack frame.\n")); - add_com_alias ("V", "frame", class_stack, 1); - } add_com ("select-frame", class_stack, select_frame_command, _("\ Select a stack frame without printing anything.\n\ An argument specifies the frame to select.\n\ @@ -2688,15 +2658,6 @@ With a negative argument, print outermost -COUNT frames.\nUse of the \ Use of the 'no-filters' qualifier prohibits frame filters from executing\n\ on this backtrace.\n")); add_com_alias ("bt", "backtrace", class_stack, 0); - if (xdb_commands) - { - add_com_alias ("t", "backtrace", class_stack, 0); - add_com ("T", class_stack, backtrace_full_command, _("\ -Print backtrace of all stack frames, or innermost COUNT frames\n\ -and the values of the local variables.\n\ -With a negative argument, print outermost -COUNT frames.\n\ -Usage: T <count>\n")); - } add_com_alias ("where", "backtrace", class_alias, 0); add_info ("stack", backtrace_command, @@ -2709,9 +2670,6 @@ Usage: T <count>\n")); _("Local variables of current stack frame.")); add_info ("args", args_info, _("Argument variables of current stack frame.")); - if (xdb_commands) - add_com ("l", class_info, args_plus_locals_info, - _("Argument and local variables of current stack frame.")); if (dbx_commands) add_com ("func", class_stack, func_command, _("\ diff --git a/gdb/symtab.c b/gdb/symtab.c index a1f8afb..72df872 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -6250,14 +6250,6 @@ All global and static variable names, or those matching REGEXP.")); add_com ("rbreak", class_breakpoint, rbreak_command, _("Set a breakpoint for all functions matching REGEXP.")); - if (xdb_commands) - { - add_com ("lf", class_info, sources_info, - _("Source files in the program")); - add_com ("lg", class_info, variables_info, _("\ -All global and static variable names, or those matching REGEXP.")); - } - add_setshow_enum_cmd ("multiple-symbols", no_class, multiple_symbols_modes, &multiple_symbols_mode, _("\ diff --git a/gdb/thread.c b/gdb/thread.c index 80c8705..23dfcc9 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1804,8 +1804,7 @@ Usage: thread find REGEXP\n\ Will display thread ids whose name, target ID, or extra info matches REGEXP."), &thread_cmd_list); - if (!xdb_commands) - add_com_alias ("t", "thread", class_run, 1); + add_com_alias ("t", "thread", class_run, 1); add_setshow_boolean_cmd ("thread-events", no_class, &print_thread_events, _("\ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 6547404..4c25d43 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -63,10 +63,7 @@ static void show_data (enum tui_layout_type); static enum tui_layout_type next_layout (void); static enum tui_layout_type prev_layout (void); static void tui_layout_command (char *, int); -static void tui_toggle_layout_command (char *, int); -static void tui_toggle_split_layout_command (char *, int); static void extract_display_start_addr (struct gdbarch **, CORE_ADDR *); -static void tui_handle_xdb_layout (struct tui_layout_def *); /*************************************** @@ -396,14 +393,6 @@ Layout names are:\n\ source/assembly/command (split) is displayed, \n\ the register window is displayed with \n\ the window that has current logical focus.\n")); - if (xdb_commands) - { - add_com ("td", class_tui, tui_toggle_layout_command, _("\ -Toggle between Source/Command and Disassembly/Command layouts.\n")); - add_com ("ts", class_tui, tui_toggle_split_layout_command, _("\ -Toggle between Source/Command or Disassembly/Command and \n\ -Source/Disassembly/Command layouts.\n")); - } } @@ -554,53 +543,6 @@ extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p) static void -tui_handle_xdb_layout (struct tui_layout_def *layout_def) -{ - if (layout_def->split) - { - tui_set_layout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS); - tui_set_win_focus_to (tui_win_list[layout_def->display_mode]); - } - else - { - if (layout_def->display_mode == SRC_WIN) - tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS); - else - tui_set_layout (DISASSEM_DATA_COMMAND, layout_def->regs_display_type); - } -} - - -static void -tui_toggle_layout_command (char *arg, int from_tty) -{ - struct tui_layout_def *layout_def = tui_layout_def (); - - /* Make sure the curses mode is enabled. */ - tui_enable (); - if (layout_def->display_mode == SRC_WIN) - layout_def->display_mode = DISASSEM_WIN; - else - layout_def->display_mode = SRC_WIN; - - if (!layout_def->split) - tui_handle_xdb_layout (layout_def); -} - - -static void -tui_toggle_split_layout_command (char *arg, int from_tty) -{ - struct tui_layout_def *layout_def = tui_layout_def (); - - /* Make sure the curses mode is enabled. */ - tui_enable (); - layout_def->split = (!layout_def->split); - tui_handle_xdb_layout (layout_def); -} - - -static void tui_layout_command (char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 961491f..feb11ba 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -58,9 +58,6 @@ static enum tui_status tui_get_register (struct frame_info *frame, struct tui_data_element *data, int regnum, int *changedp); -static void tui_scroll_regs_forward_command (char *, int); -static void tui_scroll_regs_backward_command (char *, int); - /***************************************** @@ -637,20 +634,6 @@ _initialize_tui_regs (void) add_cmd ("next", class_tui, tui_reg_next_command, _("Display next register group."), &tuireglist); - - if (xdb_commands) - { - add_com ("fr", class_tui, tui_reg_float_command, - _("Display only floating point registers\n")); - add_com ("gr", class_tui, tui_reg_general_command, - _("Display only general registers\n")); - add_com ("sr", class_tui, tui_reg_system_command, - _("Display only special registers\n")); - add_com ("+r", class_tui, tui_scroll_regs_forward_command, - _("Scroll the registers window forward\n")); - add_com ("-r", class_tui, tui_scroll_regs_backward_command, - _("Scroll the register window backward\n")); - } } @@ -730,16 +713,3 @@ tui_get_register (struct frame_info *frame, } return ret; } - -static void -tui_scroll_regs_forward_command (char *arg, int from_tty) -{ - tui_scroll (FORWARD_SCROLL, TUI_DATA_WIN, 1); -} - - -static void -tui_scroll_regs_backward_command (char *arg, int from_tty) -{ - tui_scroll (BACKWARD_SCROLL, TUI_DATA_WIN, 1); -} diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 4dfa834..77218e8 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -64,7 +64,6 @@ static int new_height_ok (struct tui_win_info *, int); static void tui_set_tab_width_command (char *, int); static void tui_refresh_all_command (char *, int); static void tui_set_win_height_command (char *, int); -static void tui_xdb_set_win_height_command (char *, int); static void tui_all_windows_info (char *, int); static void tui_set_focus_command (char *, int); static void tui_scroll_forward_command (char *, int); @@ -380,8 +379,6 @@ _initialize_tui_win (void) add_com ("refresh", class_tui, tui_refresh_all_command, _("Refresh the terminal display.\n")); - if (xdb_commands) - add_com_alias ("U", "refresh", class_tui, 0); add_com ("tabset", class_tui, tui_set_tab_width_command, _("\ Set the width (in characters) of tab stops.\n\ Usage: tabset <n>\n")); @@ -417,10 +414,6 @@ Usage: < [win] [n]\n")); add_com (">", class_tui, tui_scroll_right_command, _("\ Scroll window text to the right.\n\ Usage: > [win] [n]\n")); - if (xdb_commands) - add_com ("w", class_xdb, tui_xdb_set_win_height_command, _("\ -XDB compatibility command for setting the height of a command window.\n\ -Usage: w <#lines>\n")); /* Define the tui control variables. */ add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums, @@ -1167,45 +1160,6 @@ tui_set_win_height_command (char *arg, int from_tty) tui_set_win_height (arg, from_tty); } - -/* XDB Compatibility command for setting the window height. This will - increase or decrease the command window by the specified - amount. */ -static void -tui_xdb_set_win_height (char *arg, int from_tty) -{ - /* Make sure the curses mode is enabled. */ - tui_enable (); - if (arg != (char *) NULL) - { - int input_no = atoi (arg); - - if (input_no > 0) - { /* Add 1 for the locator. */ - int new_height = tui_term_height () - (input_no + 1); - - if (!new_height_ok (tui_win_list[CMD_WIN], new_height) - || tui_adjust_win_heights (tui_win_list[CMD_WIN], - new_height) == TUI_FAILURE) - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), XDBWIN_HEIGHT_USAGE); -} - -/* Set the height of the specified window, with va_list. */ -static void -tui_xdb_set_win_height_command (char *arg, int from_tty) -{ - tui_xdb_set_win_height (arg, from_tty); -} - - /* Function to adjust all window heights around the primary. */ static enum tui_status tui_adjust_win_heights (struct tui_win_info *primary_win_info, diff --git a/gdb/utils.c b/gdb/utils.c index 7172bba..a9350d9 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2670,18 +2670,6 @@ subset_compare (char *string_to_compare, char *template_string) } static void -pagination_on_command (char *arg, int from_tty) -{ - pagination_enabled = 1; -} - -static void -pagination_off_command (char *arg, int from_tty) -{ - pagination_enabled = 0; -} - -static void show_debug_timestamp (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { @@ -2725,14 +2713,6 @@ Turning pagination off is an alternative to \"set height unlimited\"."), show_pagination_enabled, &setlist, &showlist); - if (xdb_commands) - { - add_com ("am", class_support, pagination_on_command, - _("Enable pagination")); - add_com ("sm", class_support, pagination_off_command, - _("Disable pagination")); - } - add_setshow_boolean_cmd ("sevenbit-strings", class_support, &sevenbit_strings, _("\ Set printing of 8-bit characters in strings as \\nnn."), _("\ |