/* GDB CLI commands.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010,
+ 2011 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 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "exceptions.h"
+#include "arch-utils.h"
#include "readline/readline.h"
#include "readline/tilde.h"
#include "completer.h"
-#include "target.h" /* For baud_rate, remote_debug and remote_timeout */
-#include "gdb_wait.h" /* For shell escape implementation */
-#include "gdb_regex.h" /* Used by apropos_command */
+#include "target.h" /* For baud_rate, remote_debug and remote_timeout. */
+#include "gdb_wait.h" /* For shell escape implementation. */
+#include "gdb_regex.h" /* Used by apropos_command. */
#include "gdb_string.h"
#include "gdb_vfork.h"
#include "linespec.h"
#include "frame.h"
#include "value.h"
#include "language.h"
-#include "filenames.h" /* for DOSish file names */
+#include "filenames.h" /* For DOSish file names. */
#include "objfiles.h"
#include "source.h"
#include "disasm.h"
+#include "tracepoint.h"
#include "ui-out.h"
#include "cli/cli-setshow.h"
#include "cli/cli-cmds.h"
+#include "python/python.h"
+
#ifdef TUI
-#include "tui/tui.h" /* For tui_active et.al. */
+#include "tui/tui.h" /* For tui_active et.al. */
#endif
#include <fcntl.h>
struct cmd_list_element *infolist;
-/* Chain containing all defined enable subcommands. */
+/* Chain containing all defined enable subcommands. */
struct cmd_list_element *enablelist;
-/* Chain containing all defined disable subcommands. */
+/* Chain containing all defined disable subcommands. */
struct cmd_list_element *disablelist;
-/* Chain containing all defined toggle subcommands. */
+/* Chain containing all defined toggle subcommands. */
struct cmd_list_element *togglelist;
-/* Chain containing all defined stop subcommands. */
+/* Chain containing all defined stop subcommands. */
struct cmd_list_element *stoplist;
-/* Chain containing all defined delete subcommands. */
+/* Chain containing all defined delete subcommands. */
struct cmd_list_element *deletelist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
+/* Chain containing all defined detach subcommands. */
+
+struct cmd_list_element *detachlist;
+
+/* Chain containing all defined kill subcommands. */
+
+struct cmd_list_element *killlist;
+
+/* Chain containing all defined "enable breakpoint" subcommands. */
struct cmd_list_element *enablebreaklist;
struct cmd_list_element *unsethistlist;
-/* Chain containing all defined maintenance subcommands. */
+/* Chain containing all defined maintenance subcommands. */
struct cmd_list_element *maintenancelist;
-/* Chain containing all defined "maintenance info" subcommands. */
+/* Chain containing all defined "maintenance info" subcommands. */
struct cmd_list_element *maintenanceinfolist;
-/* Chain containing all defined "maintenance print" subcommands. */
+/* Chain containing all defined "maintenance print" subcommands. */
struct cmd_list_element *maintenanceprintlist;
struct cmd_list_element *setchecklist;
struct cmd_list_element *showchecklist;
+
+/* Command tracing state. */
+
+int source_verbose = 0;
+int trace_commands = 0;
+\f
+/* 'script-extension' option support. */
+
+static const char script_ext_off[] = "off";
+static const char script_ext_soft[] = "soft";
+static const char script_ext_strict[] = "strict";
+
+static const char *script_ext_enums[] = {
+ script_ext_off,
+ script_ext_soft,
+ script_ext_strict,
+ NULL
+};
+
+static const char *script_ext_mode = script_ext_soft;
\f
/* Utility used everywhere when at least one argument is needed and
- none is supplied. */
+ none is supplied. */
void
error_no_arg (char *why)
}
/* The "info" command is defined as a prefix, with allow_unknown = 0.
- Therefore, its own definition is called only for "info" with no args. */
+ Therefore, its own definition is called only for "info" with no
+ args. */
static void
info_command (char *arg, int from_tty)
{
- printf_unfiltered (_("\"info\" must be followed by the name of an info command.\n"));
+ printf_unfiltered (_("\"info\" must be followed by "
+ "the name of an info command.\n"));
help_list (infolist, "info ", -1, gdb_stdout);
}
{
const char **s1 = (const char **) arg1;
const char **s2 = (const char **) arg2;
+
return strcmp (*s1, *s2);
}
static void
complete_command (char *arg, int from_tty)
{
- int i;
int argpoint;
char **completions, *point, *arg_prefix;
arg = "";
argpoint = strlen (arg);
- /* complete_line assumes that its first argument is somewhere within,
- and except for filenames at the beginning of, the word to be completed.
- The following crude imitation of readline's word-breaking tries to
- accomodate this. */
+ /* complete_line assumes that its first argument is somewhere
+ within, and except for filenames at the beginning of, the word to
+ be completed. The following crude imitation of readline's
+ word-breaking tries to accomodate this. */
point = arg + argpoint;
while (point > arg)
{
while (item < size)
{
int next_item;
+
printf_unfiltered ("%s%s\n", arg_prefix, completions[item]);
next_item = item + 1;
while (next_item < size
{
if (!quit_confirm ())
error (_("Not confirmed."));
+
+ disconnect_tracing (from_tty);
+
quit_force (args, from_tty);
}
{
if (args)
error (_("The \"pwd\" command does not take an argument: %s"), args);
- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
+ error (_("Error finding name of working directory: %s"),
+ safe_strerror (errno));
if (strcmp (gdb_dirbuf, current_directory) != 0)
printf_unfiltered (_("Working directory %s\n (canonically %s).\n"),
/* Search backwards for the directory just before the "/.."
and obliterate it and the "/..". */
char *q = p;
+
while (q != current_directory && !IS_DIR_SEPARATOR (q[-1]))
--q;
}
}
else
- /* We are dealing with leading repetitions of "/..", for example
- "/../..", which is the Mach super-root. */
+ /* We are dealing with leading repetitions of "/..", for
+ example "/../..", which is the Mach super-root. */
p += 3;
}
else
pwd_command ((char *) 0, 1);
}
\f
-void
-source_command (char *args, int from_tty)
+/* Show the current value of the 'script-extension' option. */
+
+static void
+show_script_ext_mode (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
{
- FILE *stream;
- struct cleanup *old_cleanups;
- char *file = args;
- char *full_pathname = NULL;
+ fprintf_filtered (file,
+ _("Script filename extension recognition is \"%s\".\n"),
+ value);
+}
+
+/* Try to open SCRIPT_FILE.
+ If successful, the full path name is stored in *FULL_PATHP,
+ the stream is stored in *STREAMP, and return 1.
+ The caller is responsible for freeing *FULL_PATHP.
+ If not successful, return 0; errno is set for the last file
+ we tried to open.
+
+ If SEARCH_PATH is non-zero, and the file isn't found in cwd,
+ search for it in the source search path.
+
+ NOTE: This calls openp which uses xfullpath to compute the full path
+ instead of gdb_realpath. Symbolic links are not resolved. */
+
+int
+find_and_open_script (const char *script_file, int search_path,
+ FILE **streamp, char **full_pathp)
+{
+ char *file;
int fd;
+ struct cleanup *old_cleanups;
+ int search_flags = OPF_TRY_CWD_FIRST;
+
+ file = tilde_expand (script_file);
+ old_cleanups = make_cleanup (xfree, file);
+
+ if (search_path)
+ search_flags |= OPF_SEARCH_IN_PATH;
+
+ /* Search for and open 'file' on the search path used for source
+ files. Put the full location in *FULL_PATHP. */
+ fd = openp (source_path, search_flags,
+ file, O_RDONLY, full_pathp);
- if (file == NULL)
+ if (fd == -1)
{
- error (_("source command requires pathname of file to source."));
+ int save_errno = errno;
+ do_cleanups (old_cleanups);
+ errno = save_errno;
+ return 0;
}
- file = tilde_expand (file);
- old_cleanups = make_cleanup (xfree, file);
+ do_cleanups (old_cleanups);
- /* Search for and open 'file' on the search path used for source
- files. Put the full location in 'full_pathname'. */
- fd = openp (source_path, OPF_TRY_CWD_FIRST,
- file, O_RDONLY, 0, &full_pathname);
+ *streamp = fdopen (fd, FOPEN_RT);
+ return 1;
+}
- /* Use the full path name, if it is found. */
- if (full_pathname != NULL && fd != -1)
+/* Load script FILE, which has already been opened as STREAM.
+ STREAM is closed before we return. */
+
+static void
+source_script_from_stream (FILE *stream, const char *file)
+{
+ if (script_ext_mode != script_ext_off
+ && strlen (file) > 3 && !strcmp (&file[strlen (file) - 3], ".py"))
{
- file = full_pathname;
+ volatile struct gdb_exception e;
+
+ TRY_CATCH (e, RETURN_MASK_ERROR)
+ {
+ source_python_script (stream, file);
+ }
+ if (e.reason < 0)
+ {
+ /* Should we fallback to ye olde GDB script mode? */
+ if (script_ext_mode == script_ext_soft
+ && e.reason == RETURN_ERROR && e.error == UNSUPPORTED_ERROR)
+ {
+ fseek (stream, 0, SEEK_SET);
+ script_from_file (stream, (char*) file);
+ }
+ else
+ {
+ /* Nope, just punt. */
+ fclose (stream);
+ throw_exception (e);
+ }
+ }
+ else
+ fclose (stream);
}
+ else
+ script_from_file (stream, file);
+}
- if (fd == -1)
+/* Worker to perform the "source" command.
+ Load script FILE.
+ If SEARCH_PATH is non-zero, and the file isn't found in cwd,
+ search for it in the source search path. */
+
+static void
+source_script_with_search (const char *file, int from_tty, int search_path)
+{
+ FILE *stream;
+ char *full_path;
+ struct cleanup *old_cleanups;
+
+ if (file == NULL || *file == 0)
+ error (_("source command requires file name of file to source."));
+
+ if (!find_and_open_script (file, search_path, &stream, &full_path))
{
+ /* The script wasn't found, or was otherwise inaccessible.
+ If the source command was invoked interactively, throw an
+ error. Otherwise (e.g. if it was invoked by a script),
+ silently ignore the error. */
if (from_tty)
perror_with_name (file);
else
return;
}
- stream = fdopen (fd, FOPEN_RT);
- script_from_file (stream, file);
+ old_cleanups = make_cleanup (xfree, full_path);
+ source_script_from_stream (stream, file);
+ do_cleanups (old_cleanups);
+}
+
+/* Wrapper around source_script_with_search to export it to main.c
+ for use in loading .gdbinit scripts. */
+
+void
+source_script (char *file, int from_tty)
+{
+ source_script_with_search (file, from_tty, 0);
+}
+
+/* Return the source_verbose global variable to its previous state
+ on exit from the source command, by whatever means. */
+static void
+source_verbose_cleanup (void *old_value)
+{
+ source_verbose = *(int *)old_value;
+ xfree (old_value);
+}
+
+static void
+source_command (char *args, int from_tty)
+{
+ struct cleanup *old_cleanups;
+ char *file = args;
+ int *old_source_verbose = xmalloc (sizeof(int));
+ int search_path = 0;
+
+ *old_source_verbose = source_verbose;
+ old_cleanups = make_cleanup (source_verbose_cleanup,
+ old_source_verbose);
+
+ /* -v causes the source command to run in verbose mode.
+ -s causes the file to be searched in the source search path,
+ even if the file name contains a '/'.
+ We still have to be able to handle filenames with spaces in a
+ backward compatible way, so buildargv is not appropriate. */
+
+ if (args)
+ {
+ while (args[0] != '\0')
+ {
+ /* Make sure leading white space does not break the
+ comparisons. */
+ while (isspace(args[0]))
+ args++;
+
+ if (args[0] != '-')
+ break;
+
+ if (args[1] == 'v' && isspace (args[2]))
+ {
+ source_verbose = 1;
+
+ /* Skip passed -v. */
+ args = &args[3];
+ }
+ else if (args[1] == 's' && isspace (args[2]))
+ {
+ search_path = 1;
+
+ /* Skip passed -s. */
+ args = &args[3];
+ }
+ else
+ break;
+ }
+
+ while (isspace (args[0]))
+ args++;
+ file = args;
+ }
+
+ source_script_with_search (file, from_tty, search_path);
do_cleanups (old_cleanups);
}
+
static void
echo_command (char *text, int from_tty)
{
if (*p == 0)
return;
- c = parse_escape (&p);
+ c = parse_escape (get_current_arch (), &p);
if (c >= 0)
printf_filtered ("%c", c);
}
gdb_flush (gdb_stderr);
}
#ifdef GLOBAL_CURDIR
- /* Make sure to return to the directory GDB thinks it is, in case the
- shell command we just ran changed it. */
+ /* Make sure to return to the directory GDB thinks it is, in case
+ the shell command we just ran changed it. */
chdir (current_directory);
#endif
#else /* Can fork. */
if ((user_shell = (char *) getenv ("SHELL")) == NULL)
user_shell = "/bin/sh";
- /* Get the name of the shell for arg0 */
+ /* Get the name of the shell for arg0. */
if ((p = strrchr (user_shell, '/')) == NULL)
p = user_shell;
else
struct symtab_and_line sal;
struct symbol *sym;
char *arg1;
- int cmdlen, log10;
- unsigned m;
char *editor;
char *p, *fn;
- /* Pull in the current default source line if necessary */
+ /* Pull in the current default source line if necessary. */
if (arg == 0)
{
set_default_source_symtab_and_line ();
sal = get_current_source_symtab_and_line ();
}
- /* bare "edit" edits file with present line. */
+ /* Bare "edit" edits file with present line. */
if (arg == 0)
{
}
else
{
-
- /* Now should only be one argument -- decode it in SAL */
+ /* Now should only be one argument -- decode it in SAL. */
arg1 = arg;
sals = decode_line_1 (&arg1, 0, 0, 0, 0, 0);
- if (! sals.nelts) return; /* C++ */
- if (sals.nelts > 1) {
- ambiguous_line_spec (&sals);
- xfree (sals.sals);
- return;
- }
+ if (! sals.nelts)
+ {
+ /* C++ */
+ return;
+ }
+ if (sals.nelts > 1)
+ {
+ ambiguous_line_spec (&sals);
+ xfree (sals.sals);
+ return;
+ }
sal = sals.sals[0];
xfree (sals.sals);
if (*arg1)
error (_("Junk at end of line specification."));
- /* if line was specified by address,
- first print exactly which line, and which file.
- In this case, sal.symtab == 0 means address is outside
- of all known source files, not that user failed to give a filename. */
+ /* If line was specified by address, first print exactly which
+ line, and which file. In this case, sal.symtab == 0 means
+ address is outside of all known source files, not that user
+ failed to give a filename. */
if (*arg == '*')
{
+ struct gdbarch *gdbarch;
+
if (sal.symtab == 0)
/* FIXME-32x64--assumes sal.pc fits in long. */
error (_("No source file for address %s."),
hex_string ((unsigned long) sal.pc));
+
+ gdbarch = get_objfile_arch (sal.symtab->objfile);
sym = find_pc_function (sal.pc);
if (sym)
- {
- deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
- printf_filtered (" is in ");
- fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout);
- printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
- }
+ printf_filtered ("%s is in %s (%s:%d).\n",
+ paddress (gdbarch, sal.pc),
+ SYMBOL_PRINT_NAME (sym),
+ sal.symtab->filename, sal.line);
else
- {
- deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
- printf_filtered (" is at %s:%d.\n",
- sal.symtab->filename, sal.line);
- }
+ printf_filtered ("%s is at %s:%d.\n",
+ paddress (gdbarch, sal.pc),
+ sal.symtab->filename, sal.line);
}
- /* If what was given does not imply a symtab, it must be an undebuggable
- symbol which means no source code. */
+ /* If what was given does not imply a symtab, it must be an
+ undebuggable symbol which means no source code. */
if (sal.symtab == 0)
error (_("No line number known for %s."), arg);
if ((editor = (char *) getenv ("EDITOR")) == NULL)
editor = "/bin/ex";
- /* Approximate base-10 log of line to 1 unit for digit count */
- for(log10=32, m=0x80000000; !(sal.line & m) && log10>0; log10--, m=m>>1);
- log10 = 1 + (int)((log10 + (0 == ((m-1) & sal.line)))/3.32192809);
-
/* If we don't already know the full absolute file name of the
source file, find it now. */
if (!sal.symtab->fullname)
/* Quote the file name, in case it has whitespace or other special
characters. */
p = xstrprintf ("%s +%d \"%s\"", editor, sal.line, fn);
- shell_escape(p, from_tty);
- xfree(p);
+ shell_escape (p, from_tty);
+ xfree (p);
}
static void
list_command (char *arg, int from_tty)
{
struct symtabs_and_lines sals, sals_end;
- struct symtab_and_line sal = { };
- struct symtab_and_line sal_end = { };
- struct symtab_and_line cursal = { };
+ struct symtab_and_line sal = { 0 };
+ struct symtab_and_line sal_end = { 0 };
+ struct symtab_and_line cursal = { 0 };
struct symbol *sym;
char *arg1;
int no_end = 1;
int linenum_beg = 0;
char *p;
- /* Pull in the current default source line if necessary */
+ /* Pull in the current default source line if necessary. */
if (arg == 0 || arg[0] == '+' || arg[0] == '-')
{
set_default_source_symtab_and_line ();
return;
}
- /* "l -" lists previous ten lines, the ones before the ten just listed. */
+ /* "l -" lists previous ten lines, the ones before the ten just
+ listed. */
if (strcmp (arg, "-") == 0)
{
print_source_lines (cursal.symtab,
- max (get_first_line_listed () - get_lines_to_list (), 1),
+ max (get_first_line_listed ()
+ - get_lines_to_list (), 1),
get_first_line_listed (), 0);
return;
}
if (dummy_beg && dummy_end)
error (_("Two empty args do not say what lines to list."));
- /* if line was specified by address,
+ /* If line was specified by address,
first print exactly which line, and which file.
- In this case, sal.symtab == 0 means address is outside
- of all known source files, not that user failed to give a filename. */
+
+ In this case, sal.symtab == 0 means address is outside of all
+ known source files, not that user failed to give a filename. */
if (*arg == '*')
{
+ struct gdbarch *gdbarch;
+
if (sal.symtab == 0)
/* FIXME-32x64--assumes sal.pc fits in long. */
error (_("No source file for address %s."),
hex_string ((unsigned long) sal.pc));
+
+ gdbarch = get_objfile_arch (sal.symtab->objfile);
sym = find_pc_function (sal.pc);
if (sym)
- {
- deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
- printf_filtered (" is in ");
- fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout);
- printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
- }
+ printf_filtered ("%s is in %s (%s:%d).\n",
+ paddress (gdbarch, sal.pc),
+ SYMBOL_PRINT_NAME (sym),
+ sal.symtab->filename, sal.line);
else
- {
- deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
- printf_filtered (" is at %s:%d.\n",
- sal.symtab->filename, sal.line);
- }
+ printf_filtered ("%s is at %s:%d.\n",
+ paddress (gdbarch, sal.pc),
+ sal.symtab->filename, sal.line);
}
- /* If line was not specified by just a line number,
- and it does not imply a symtab, it must be an undebuggable symbol
- which means no source code. */
+ /* If line was not specified by just a line number, and it does not
+ imply a symtab, it must be an undebuggable symbol which means no
+ source code. */
if (!linenum_beg && sal.symtab == 0)
error (_("No line number known for %s."), arg);
0);
}
-/* Dump a specified section of assembly code. With no command line
- arguments, this command will dump the assembly code for the
- function surrounding the pc value in the selected frame. With one
- argument, it will dump the assembly code surrounding that pc value.
- Two arguments are interpeted as bounds within which to dump
- assembly. */
+/* Subroutine of disassemble_command to simplify it.
+ Perform the disassembly.
+ NAME is the name of the function if known, or NULL.
+ [LOW,HIGH) are the range of addresses to disassemble.
+ MIXED is non-zero to print source with the assembler. */
+
+static void
+print_disassembly (struct gdbarch *gdbarch, const char *name,
+ CORE_ADDR low, CORE_ADDR high, int flags)
+{
+#if defined(TUI)
+ if (!tui_is_window_visible (DISASSEM_WIN))
+#endif
+ {
+ printf_filtered ("Dump of assembler code ");
+ if (name != NULL)
+ printf_filtered ("for function %s:\n", name);
+ else
+ printf_filtered ("from %s to %s:\n",
+ paddress (gdbarch, low), paddress (gdbarch, high));
+
+ /* Dump the specified range. */
+ gdb_disassembly (gdbarch, uiout, 0, flags, -1, low, high);
+
+ printf_filtered ("End of assembler dump.\n");
+ gdb_flush (gdb_stdout);
+ }
+#if defined(TUI)
+ else
+ {
+ tui_show_assembly (gdbarch, low);
+ }
+#endif
+}
+
+/* Subroutine of disassemble_command to simplify it.
+ Print a disassembly of the current function according to FLAGS. */
+
+static void
+disassemble_current_function (int flags)
+{
+ struct frame_info *frame;
+ struct gdbarch *gdbarch;
+ CORE_ADDR low, high, pc;
+ char *name;
+
+ frame = get_selected_frame (_("No frame selected."));
+ gdbarch = get_frame_arch (frame);
+ pc = get_frame_pc (frame);
+ if (find_pc_partial_function (pc, &name, &low, &high) == 0)
+ error (_("No function contains program counter for selected frame."));
+#if defined(TUI)
+ /* NOTE: cagney/2003-02-13 The `tui_active' was previously
+ `tui_version'. */
+ if (tui_active)
+ /* FIXME: cagney/2004-02-07: This should be an observer. */
+ low = tui_get_low_disassembly_address (gdbarch, low, pc);
+#endif
+ low += gdbarch_deprecated_function_start_offset (gdbarch);
+
+ print_disassembly (gdbarch, name, low, high, flags);
+}
+
+/* Dump a specified section of assembly code.
+
+ Usage:
+ disassemble [/mr]
+ - dump the assembly code for the function of the current pc
+ disassemble [/mr] addr
+ - dump the assembly code for the function at ADDR
+ disassemble [/mr] low,high
+ disassemble [/mr] low,+length
+ - dump the assembly code in the range [LOW,HIGH), or [LOW,LOW+length)
+
+ A /m modifier will include source code with the assembly.
+ A /r modifier will include raw instructions in hex with the assembly. */
static void
disassemble_command (char *arg, int from_tty)
{
+ struct gdbarch *gdbarch = get_current_arch ();
CORE_ADDR low, high;
char *name;
- CORE_ADDR pc, pc_masked;
- char *space_index;
-#if 0
- asection *section;
-#endif
+ CORE_ADDR pc;
+ int flags;
name = NULL;
- if (!arg)
+ flags = 0;
+
+ if (arg && *arg == '/')
{
- if (!deprecated_selected_frame)
- error (_("No frame selected."));
+ ++arg;
- pc = get_frame_pc (deprecated_selected_frame);
- if (find_pc_partial_function (pc, &name, &low, &high) == 0)
- error (_("No function contains program counter for selected frame."));
-#if defined(TUI)
- /* NOTE: cagney/2003-02-13 The `tui_active' was previously
- `tui_version'. */
- if (tui_active)
- /* FIXME: cagney/2004-02-07: This should be an observer. */
- low = tui_get_low_disassembly_address (low, pc);
-#endif
- low += DEPRECATED_FUNCTION_START_OFFSET;
+ if (*arg == '\0')
+ error (_("Missing modifier."));
+
+ while (*arg && ! isspace (*arg))
+ {
+ switch (*arg++)
+ {
+ case 'm':
+ flags |= DISASSEMBLY_SOURCE;
+ break;
+ case 'r':
+ flags |= DISASSEMBLY_RAW_INSN;
+ break;
+ default:
+ error (_("Invalid disassembly modifier."));
+ }
+ }
+
+ while (isspace (*arg))
+ ++arg;
}
- else if (!(space_index = (char *) strchr (arg, ' ')))
+
+ if (! arg || ! *arg)
+ {
+ flags |= DISASSEMBLY_OMIT_FNAME;
+ disassemble_current_function (flags);
+ return;
+ }
+
+ pc = value_as_address (parse_to_comma_and_eval (&arg));
+ if (arg[0] == ',')
+ ++arg;
+ if (arg[0] == '\0')
{
/* One argument. */
- pc = parse_and_eval_address (arg);
if (find_pc_partial_function (pc, &name, &low, &high) == 0)
error (_("No function contains specified address."));
#if defined(TUI)
`tui_version'. */
if (tui_active)
/* FIXME: cagney/2004-02-07: This should be an observer. */
- low = tui_get_low_disassembly_address (low, pc);
+ low = tui_get_low_disassembly_address (gdbarch, low, pc);
#endif
- low += DEPRECATED_FUNCTION_START_OFFSET;
+ low += gdbarch_deprecated_function_start_offset (gdbarch);
+ flags |= DISASSEMBLY_OMIT_FNAME;
}
else
{
/* Two arguments. */
- *space_index = '\0';
- low = parse_and_eval_address (arg);
- high = parse_and_eval_address (space_index + 1);
- }
-
-#if defined(TUI)
- if (!tui_is_window_visible (DISASSEM_WIN))
-#endif
- {
- printf_filtered ("Dump of assembler code ");
- if (name != NULL)
- {
- printf_filtered ("for function %s:\n", name);
- }
- else
+ int incl_flag = 0;
+ low = pc;
+ while (isspace (*arg))
+ arg++;
+ if (arg[0] == '+')
{
- printf_filtered ("from ");
- deprecated_print_address_numeric (low, 1, gdb_stdout);
- printf_filtered (" to ");
- deprecated_print_address_numeric (high, 1, gdb_stdout);
- printf_filtered (":\n");
+ ++arg;
+ incl_flag = 1;
}
-
- /* Dump the specified range. */
- gdb_disassembly (uiout, 0, 0, 0, -1, low, high);
-
- printf_filtered ("End of assembler dump.\n");
- gdb_flush (gdb_stdout);
+ high = parse_and_eval_address (arg);
+ if (incl_flag)
+ high += low;
}
-#if defined(TUI)
- else
- {
- tui_show_assembly (low);
- }
-#endif
+
+ print_disassembly (gdbarch, name, low, high, flags);
}
static void
if (args)
{
- c = lookup_cmd (&args, cmdlist, "", 0, 1);
+ char *comname = args;
+
+ c = lookup_cmd (&comname, cmdlist, "", 0, 1);
if (c->class != class_user)
error (_("Not a user command."));
- show_user_1 (c, gdb_stdout);
+ show_user_1 (c, "", args, gdb_stdout);
}
else
{
for (c = cmdlist; c; c = c->next)
{
- if (c->class == class_user)
- show_user_1 (c, gdb_stdout);
+ if (c->class == class_user || c->prefixlist != NULL)
+ show_user_1 (c, "", c->name, gdb_stdout);
}
}
}
/* Search through names of commands and documentations for a certain
- regular expression.
-*/
+ regular expression. */
+
void
apropos_command (char *searchstr, int from_tty)
{
- extern struct cmd_list_element *cmdlist; /*This is the main command list*/
+ extern struct cmd_list_element *cmdlist; /* This is the main command
+ list. */
regex_t pattern;
char *pattern_fastmap;
char errorbuffer[512];
+
pattern_fastmap = xcalloc (256, sizeof (char));
if (searchstr == NULL)
error (_("REGEXP string is empty"));
}
\f
/* Print a list of files and line numbers which a user may choose from
- in order to list a function which was specified ambiguously (as with
- `list classname::overloadedfuncname', for example). The vector in
- SALS provides the filenames and line numbers. */
+ in order to list a function which was specified ambiguously (as
+ with `list classname::overloadedfuncname', for example). The
+ vector in SALS provides the filenames and line numbers. */
static void
ambiguous_line_spec (struct symtabs_and_lines *sals)
static void
set_debug (char *arg, int from_tty)
{
- printf_unfiltered (_("\"set debug\" must be followed by the name of a print subcommand.\n"));
+ printf_unfiltered (_("\"set debug\" must be followed by "
+ "the name of a debug subcommand.\n"));
help_list (setdebuglist, "set debug ", -1, gdb_stdout);
}
togglelist = NULL;
stoplist = NULL;
deletelist = NULL;
+ detachlist = NULL;
enablebreaklist = NULL;
setlist = NULL;
unsetlist = NULL;
const char *value)
{
if (info_verbose)
- fprintf_filtered (file, _("\
-Verbose printing of informational messages is %s.\n"), value);
+ fprintf_filtered (file,
+ _("Verbose printing of informational messages is %s.\n"),
+ value);
else
fprintf_filtered (file, _("Verbosity is %s.\n"), value);
}
show_remote_timeout (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("\
-Timeout limit to wait for target to respond is %s.\n"),
+ fprintf_filtered (file,
+ _("Timeout limit to wait for target to respond is %s.\n"),
value);
}
show_max_user_call_depth (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("\
-The max call depth for user-defined commands is %s.\n"),
+ fprintf_filtered (file,
+ _("The max call depth for user-defined commands is %s.\n"),
value);
}
well documented as user commands."),
&cmdlist);
add_cmd ("obscure", class_obscure, NULL, _("Obscure features."), &cmdlist);
- add_cmd ("aliases", class_alias, NULL, _("Aliases of other commands."), &cmdlist);
+ add_cmd ("aliases", class_alias, NULL,
+ _("Aliases of other commands."), &cmdlist);
add_cmd ("user-defined", class_user, NULL, _("\
User-defined commands.\n\
The commands in this class are those defined by the user.\n\
&cmdlist);
add_cmd ("running", class_run, NULL, _("Running the program."), &cmdlist);
- /* Define general commands. */
+ /* Define general commands. */
add_com ("pwd", class_files, pwd_command, _("\
Print working directory. This is used for your program as well."));
+
c = add_cmd ("cd", class_files, cd_command, _("\
Set working directory to DIR for debugger and program being debugged.\n\
The change does not take effect for the program being debugged\n\
source_help_text = xstrprintf (_("\
Read commands from a file named FILE.\n\
+\n\
+Usage: source [-s] [-v] FILE\n\
+-s: search for the script in the source search path,\n\
+ even if FILE contains directories.\n\
+-v: each command in FILE is echoed as it is executed.\n\
+\n\
Note that the file \"%s\" is read automatically in this way\n\
-when gdb is started."), gdbinit);
+when GDB is started."), gdbinit);
c = add_cmd ("source", class_support, source_command,
source_help_text, &cmdlist);
set_cmd_completer (c, filename_completer);
+ add_setshow_enum_cmd ("script-extension", class_support,
+ script_ext_enums, &script_ext_mode, _("\
+Set mode for script filename extension recognition."), _("\
+Show mode for script filename extension recognition."), _("\
+off == no filename extension recognition (all sourced files are GDB scripts)\n\
+soft == evaluate script according to filename extension, fallback to GDB script"
+ "\n\
+strict == evaluate script according to filename extension, error if not supported"
+ ),
+ NULL,
+ show_script_ext_mode,
+ &setlist, &showlist);
+
add_com ("quit", class_support, quit_command, _("Exit gdb."));
c = add_com ("help", class_support, help_command,
_("Print list of commands."));
Generic command for showing things about the program being debugged."),
&infolist, "info ", 0, &cmdlist);
add_com_alias ("i", "info", class_info, 1);
+ add_com_alias ("inf", "info", class_info, 1);
add_com ("complete", class_obscure, complete_command,
_("List the completions for the rest of the line as a command."));
- add_prefix_cmd ("show", class_info, show_command,
- _("Generic command for showing things about the debugger."),
+ add_prefix_cmd ("show", class_info, show_command, _("\
+Generic command for showing things about the debugger."),
&showlist, "show ", 0, &cmdlist);
/* Another way to get at the same thing. */
add_info ("set", show_command, _("Show all GDB settings."));
and should be terminated by the word 'else' or `end'. If an else clause\n\
is used, the same rules apply to its nested commands as to the first ones."));
- /* If target is open when baud changes, it doesn't take effect until the
- next open (I think, not sure). */
+ /* If target is open when baud changes, it doesn't take effect until
+ the next open (I think, not sure). */
add_setshow_zinteger_cmd ("remotebaud", no_class, &baud_rate, _("\
Set baud rate for remote serial I/O."), _("\
Show baud rate for remote serial I/O."), _("\
FUNCTION, to list around beginning of that function,\n\
FILE:FUNCTION, to distinguish among like-named static functions.\n\
*ADDRESS, to list around the line containing that address.\n\
-With two args if one is empty it stands for ten lines away from the other arg."));
+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);
c = add_com ("disassemble", class_vars, disassemble_command, _("\
Disassemble a specified section of memory.\n\
Default is the function surrounding the pc of the selected frame.\n\
+With a /m modifier, source lines are included (if available).\n\
+With a /r modifier, raw instructions in hex are included.\n\
With a single argument, the function surrounding that address is dumped.\n\
-Two arguments are taken as a range of memory to dump."));
+Two arguments (separated by a comma) are taken as a range of memory to dump,\n\
+ in the form of \"start,end\", or \"start,+length\"."));
set_cmd_completer (c, location_completer);
if (xdb_commands)
add_com_alias ("va", "disassemble", class_xdb, 0);
this. Instead it adds support for the form ``(gdb) ! ls''
(i.e. the space is required). If the ``!'' command below is
added the complains about no ``!'' command would be replaced by
- complains about how the ``!'' command is broken :-) */
+ complains about how the ``!'' command is broken :-) */
if (xdb_commands)
add_com_alias ("!", "shell", class_support, 0);
NULL,
show_max_user_call_depth,
&setlist, &showlist);
+
+ add_setshow_boolean_cmd ("trace-commands", no_class, &trace_commands, _("\
+Set tracing of GDB CLI commands."), _("\
+Show state of GDB CLI command tracing."), _("\
+When 'on', each command is displayed as it is executed."),
+ NULL,
+ NULL,
+ &setlist, &showlist);
}
projects / deliverable / binutils-gdb.git / blobdiff