/* List lines of source files for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1988, 1989, 1991 Free Software Foundation, Inc.
+ Copyright 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995
+ Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbcmd.h"
#include "frame.h"
-#ifdef USG
#include <sys/types.h>
-#endif
-
-#include <string.h>
+#include "gdb_string.h"
#include <sys/param.h>
-#include <sys/stat.h>
+#include "gdb_stat.h"
#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include "gdbcore.h"
#include "regex.h"
#include "symfile.h"
+#include "objfiles.h"
+#include "annotate.h"
+#include "gdbtypes.h"
/* Prototypes for local functions. */
-static int
-open_source_file PARAMS ((struct symtab *));
+static int open_source_file PARAMS ((struct symtab *));
-static int
-get_filename_and_charpos PARAMS ((struct symtab *, char **));
+static int get_filename_and_charpos PARAMS ((struct symtab *, char **));
-static void
-reverse_search_command PARAMS ((char *, int));
+static void reverse_search_command PARAMS ((char *, int));
-static void
-forward_search_command PARAMS ((char *, int));
+static void forward_search_command PARAMS ((char *, int));
-static void
-line_info PARAMS ((char *, int));
+static void line_info PARAMS ((char *, int));
-static void
-list_command PARAMS ((char *, int));
+static void list_command PARAMS ((char *, int));
-static void
-ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
+static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
-static void
-source_info PARAMS ((void));
+static void source_info PARAMS ((char *, int));
-static void
-show_directories PARAMS ((void));
+static void show_directories PARAMS ((char *, int));
-static void
-find_source_lines PARAMS ((struct symtab *, int));
+static void find_source_lines PARAMS ((struct symtab *, int));
/* If we use this declaration, it breaks because of fucking ANSI "const" stuff
on some systems. We just have to not declare it at all, have it default
static int first_line_listed;
\f
-/* Set the source file default for the "list" command, specifying a
- symtab. Sigh. Behavior specification: If it is called with a
- non-zero argument, that is the symtab to select. If it is not,
- first lookup "main"; if it exists, use the symtab and line it
- defines. If not, take the last symtab in the symtab lists (if it
- exists) or the last symtab in the psymtab lists (if *it* exists). If
- none of this works, report an error. */
+/* Set the source file default for the "list" command to be S.
+
+ If S is NULL, and we don't have a default, find one. This
+ should only be called when the user actually tries to use the
+ default, since we produce an error if we can't find a reasonable
+ default. Also, since this can cause symbols to be read, doing it
+ before we need to would make things slower than necessary. */
void
select_source_symtab (s)
return;
}
+ if (current_source_symtab)
+ return;
+
/* Make the default place to list be the function `main'
if one exists. */
if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL))
{
char *name = s -> filename;
int len = strlen (name);
- if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
{
current_source_symtab = s;
}
{
char *name = ps -> filename;
int len = strlen (name);
- if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
{
cs_pst = ps;
}
}
}
- if (current_source_symtab)
- return;
-
error ("Can't find a default source file");
}
\f
static void
-show_directories ()
+show_directories (ignore, from_tty)
+ char *ignore;
+ int from_tty;
{
- printf ("Source directories searched: %s\n", source_path);
+ puts_filtered ("Source directories searched: ");
+ puts_filtered (source_path);
+ puts_filtered ("\n");
}
-/* Forget what we learned about line positions in source files,
- and which directories contain them;
- must check again now since files may be found in
- a different directory now. */
+/* Forget what we learned about line positions in source files, and
+ which directories contain them; must check again now since files
+ may be found in a different directory now. */
void
forget_cached_source_info ()
void
init_source_path ()
{
- source_path = savestring ("$cdir:$cwd", /* strlen of it */ 10);
+ char buf[20];
+
+ sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR);
+ source_path = strsave (buf);
forget_cached_source_info ();
}
/* FIXME, this goes to "delete dir"... */
if (dirname == 0)
{
- if (query ("Reinitialize source path to empty? ", ""))
+ if (query ("Reinitialize source path to empty? "))
{
free (source_path);
init_source_path ();
else
mod_path (dirname, &source_path);
if (from_tty)
- show_directories ();
+ show_directories ((char *)0, from_tty);
forget_cached_source_info ();
}
struct stat st;
{
- char *colon = strchr (name, ':');
+ char *separator = strchr (name, DIRNAME_SEPARATOR);
char *space = strchr (name, ' ');
char *tab = strchr (name, '\t');
- if (colon == 0 && space == 0 && tab == 0)
+
+ if (separator == 0 && space == 0 && tab == 0)
p = dirname = name + strlen (name);
else
{
p = 0;
- if (colon != 0 && (p == 0 || colon < p))
- p = colon;
+ if (separator != 0 && (p == 0 || separator < p))
+ p = separator;
if (space != 0 && (p == 0 || space < p))
p = space;
if (tab != 0 && (p == 0 || tab < p))
p = tab;
dirname = p + 1;
- while (*dirname == ':' || *dirname == ' ' || *dirname == '\t')
+ while (*dirname == DIRNAME_SEPARATOR
+ || *dirname == ' '
+ || *dirname == '\t')
++dirname;
}
}
- if (p[-1] == '/')
+ if (SLASH_P (p[-1]))
/* Sigh. "foo/" => "foo" */
--p;
*p = '\0';
name = current_directory;
goto append;
}
- else if (p[-2] == '/')
+ else if (SLASH_P (p[-2]))
{
if (p - name == 2)
{
if (name[0] == '~')
name = tilde_expand (name);
- else if (name[0] != '/' && name[0] != '$')
- name = concat (current_directory, "/", name, NULL);
+ else if (!SLASH_P (name[0]) && name[0] != '$')
+ name = concat (current_directory, SLASH_STRING, name, NULL);
else
name = savestring (name, p - name);
make_cleanup (free, name);
/* Unless it's a variable, check existence. */
if (name[0] != '$') {
+ /* These are warnings, not errors, since we don't want a
+ non-existent directory in a .gdbinit file to stop processing
+ of the .gdbinit file.
+
+ Whether they get added to the path is more debatable. Current
+ answer is yes, in case the user wants to go make the directory
+ or whatever. If the directory continues to not exist/not be
+ a directory/etc, then having them in the path should be
+ harmless. */
if (stat (name, &st) < 0)
- perror_with_name (name);
- if ((st.st_mode & S_IFMT) != S_IFDIR)
- error ("%s is not a directory.", name);
+ {
+ int save_errno = errno;
+ fprintf_unfiltered (gdb_stderr, "Warning: ");
+ print_sys_errmsg (name, save_errno);
+ }
+ else if ((st.st_mode & S_IFMT) != S_IFDIR)
+ warning ("%s is not a directory.", name);
}
append:
while (1)
{
if (!strncmp (p, name, len)
- && (p[len] == '\0' || p[len] == ':'))
+ && (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
{
/* Found it in the search path, remove old copy */
if (p > *which_path)
- p--; /* Back over leading colon */
+ p--; /* Back over leading separator */
if (prefix > p - *which_path)
goto skip_dup; /* Same dir twice in one cmd */
strcpy (p, &p[len+1]); /* Copy from next \0 or : */
}
- p = strchr (p, ':');
+ p = strchr (p, DIRNAME_SEPARATOR);
if (p != 0)
++p;
else
}
if (p == 0)
{
+ char tinybuf[2];
+
+ tinybuf[0] = DIRNAME_SEPARATOR;
+ tinybuf[1] = '\0';
+
/* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */
if (prefix)
{
c = old[prefix];
old[prefix] = '\0';
- temp = concat (old, ":", name, NULL);
+ temp = concat (old, tinybuf, name, NULL);
old[prefix] = c;
*which_path = concat (temp, "", &old[prefix], NULL);
prefix = strlen (temp);
}
else
{
- *which_path = concat (name, (old[0]? ":" : old), old, NULL);
+ *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
prefix = strlen (name);
}
free (old);
static void
-source_info ()
+source_info (ignore, from_tty)
+ char *ignore;
+ int from_tty;
{
register struct symtab *s = current_source_symtab;
if (!s)
{
- printf("No current source file.\n");
+ printf_filtered("No current source file.\n");
return;
}
- printf ("Current source file is %s\n", s->filename);
+ printf_filtered ("Current source file is %s\n", s->filename);
if (s->dirname)
- printf ("Compilation directory is %s\n", s->dirname);
+ printf_filtered ("Compilation directory is %s\n", s->dirname);
if (s->fullname)
- printf ("Located in %s\n", s->fullname);
+ printf_filtered ("Located in %s\n", s->fullname);
if (s->nlines)
- printf ("Contains %d lines\n", s->nlines);
+ printf_filtered ("Contains %d line%s.\n", s->nlines,
+ s->nlines == 1 ? "" : "s");
- printf("Source language %s.\n", language_str (s->language));
+ printf_filtered("Source language is %s.\n", language_str (s->language));
}
\f
-/* Open a file named STRING, searching path PATH (dir names sep by colons)
+/* Open a file named STRING, searching path PATH (dir names sep by some char)
using mode MODE and protection bits PROT in the calls to open.
+
If TRY_CWD_FIRST, try to open ./STRING before searching PATH.
- (ie pretend the first element of PATH is ".")
+ (ie pretend the first element of PATH is "."). This also indicates
+ that a slash in STRING disables searching of the path (this is
+ so that "exec-file ./foo" or "symbol-file ./foo" insures that you
+ get that particular version of foo or an error message).
+
If FILENAMED_OPENED is non-null, set it to a newly allocated string naming
the actual file opened (this string will always start with a "/". We
have to take special pains to avoid doubling the "/" between the directory
if (!path)
path = ".";
- /* ./foo => foo */
- while (string[0] == '.' && string[1] == '/')
- string += 2;
-
- if (try_cwd_first || string[0] == '/')
+ if (try_cwd_first || SLASH_P (string[0]))
{
+ int i;
filename = string;
fd = open (filename, mode, prot);
- if (fd >= 0 || string[0] == '/')
+ if (fd >= 0)
+ goto done;
+ for (i = 0; string[i]; i++)
+ if (SLASH_P(string[0]))
goto done;
}
+ /* ./foo => foo */
+ while (string[0] == '.' && SLASH_P (string[1]))
+ string += 2;
+
alloclen = strlen (path) + strlen (string) + 2;
filename = (char *) alloca (alloclen);
fd = -1;
for (p = path; p; p = p1 ? p1 + 1 : 0)
{
- p1 = (char *) strchr (p, ':');
+ p1 = (char *) strchr (p, DIRNAME_SEPARATOR);
if (p1)
len = p1 - p;
else
filename[len] = 0;
}
- /* Beware the // my son, the Emacs barfs, the botch that catch... */
- while (len > 1 && filename[len-1] == '/')
- filename[--len] = 0;
- strcat (filename+len, "/");
+ /* Remove trailing slashes */
+ while (len > 0 && SLASH_P (filename[len-1]))
+ filename[--len] = 0;
+
+ strcat (filename+len, SLASH_STRING);
strcat (filename, string);
- fd = open (filename, mode, prot);
+ fd = open (filename, mode);
if (fd >= 0) break;
}
done:
if (filename_opened)
- if (fd < 0)
- *filename_opened = (char *) 0;
- else if (filename[0] == '/')
- *filename_opened = savestring (filename, strlen (filename));
- else
+ {
+ if (fd < 0)
+ *filename_opened = (char *) 0;
+ else if (ROOTED_P (filename))
+ *filename_opened = savestring (filename, strlen (filename));
+ else
+ {
+ /* Beware the // my son, the Emacs barfs, the botch that catch... */
+
+ *filename_opened = concat (current_directory,
+ SLASH_CHAR
+ == current_directory[strlen(current_directory)-1]
+ ? "": SLASH_STRING,
+ filename, NULL);
+ }
+ }
+#ifdef MPW
+ /* This is a debugging hack that can go away when all combinations
+ of Mac and Unix names are handled reasonably. */
+ {
+ extern int debug_openp;
+
+ if (debug_openp)
{
- /* Beware the // my son, the Emacs barfs, the botch that catch... */
-
- *filename_opened = concat (current_directory,
- '/' == current_directory[strlen(current_directory)-1]? "": "/",
- filename, NULL);
+ printf("openp on %s, path %s mode %d prot %d\n returned %d",
+ string, path, mode, prot, fd);
+ if (*filename_opened)
+ printf(" (filename is %s)", *filename_opened);
+ printf("\n");
}
+ }
+#endif /* MPW */
return fd;
}
-/* Open a source file given a symtab S. Returns a file descriptor
- or negative number for error. */
+/* Open a source file given a symtab S. Returns a file descriptor or
+ negative number for error. */
static int
open_source_file (s)
/* We cast strstr's result in case an ANSIhole has made it const,
which produces a "required warning" when assigned to a nonconst. */
p = (char *)strstr (source_path, "$cdir");
- if (p && (p == path || p[-1] == ':')
- && (p[cdir_len] == ':' || p[cdir_len] == '\0')) {
- int len;
-
- path = (char *)
- alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1);
- len = p - source_path;
- strncpy (path, source_path, len); /* Before $cdir */
- strcpy (path + len, s->dirname); /* new stuff */
- strcat (path + len, source_path + len + cdir_len); /* After $cdir */
- }
+ if (p && (p == path || p[-1] == DIRNAME_SEPARATOR)
+ && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0'))
+ {
+ int len;
+
+ path = (char *)
+ alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1);
+ len = p - source_path;
+ strncpy (path, source_path, len); /* Before $cdir */
+ strcpy (path + len, s->dirname); /* new stuff */
+ strcat (path + len, source_path + len + cdir_len); /* After $cdir */
+ }
}
result = openp (path, 0, s->filename, O_RDONLY, 0, &s->fullname);
/* Didn't work. Try using just the basename. */
p = basename (s->filename);
if (p != s->filename)
- result = openp(path, 0, p, O_RDONLY,0, &s->fullname);
+ result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
+ }
+#ifdef MPW
+ if (result < 0)
+ {
+ /* Didn't work. Try using just the MPW basename. */
+ p = (char *) mpw_basename (s->filename);
+ if (p != s->filename)
+ result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
+ }
+ if (result < 0)
+ {
+ /* Didn't work. Try using the mixed Unix/MPW basename. */
+ p = (char *) mpw_mixed_basename (s->filename);
+ if (p != s->filename)
+ result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
}
+#endif /* MPW */
+
if (result >= 0)
{
- fullname = s -> fullname;
- s -> fullname = mstrsave (s -> objfile -> md, s -> fullname);
+ fullname = s->fullname;
+ s->fullname = mstrsave (s->objfile->md, s->fullname);
free (fullname);
}
return result;
}
+/* Return the path to the source file associated with symtab. Returns NULL
+ if no symtab. */
+
+char *
+symtab_to_filename (s)
+ struct symtab *s;
+{
+ int fd;
+
+ if (!s)
+ return NULL;
+
+ /* If we've seen the file before, just return fullname. */
+
+ if (s->fullname)
+ return s->fullname;
+
+ /* Try opening the file to setup fullname */
+
+ fd = open_source_file (s);
+ if (fd < 0)
+ return s->filename; /* File not found. Just use short name */
+
+ /* Found the file. Cleanup and return the full name */
+
+ close (fd);
+ return s->fullname;
+}
+
\f
/* Create and initialize the table S->line_charpos that records
the positions of the lines in the source file, which is assumed
int lines_allocated = 1000;
int *line_charpos;
long exec_mtime;
+ int size;
line_charpos = (int *) xmmalloc (s -> objfile -> md,
lines_allocated * sizeof (int));
if (fstat (desc, &st) < 0)
perror_with_name (s->filename);
- if (exec_bfd) {
- exec_mtime = bfd_get_mtime(exec_bfd);
- if (exec_mtime && exec_mtime < st.st_mtime)
- printf ("Source file is more recent than executable.\n");
+ if (exec_bfd)
+ {
+ exec_mtime = bfd_get_mtime(exec_bfd);
+ if (exec_mtime && exec_mtime < st.st_mtime)
+ printf_filtered ("Source file is more recent than executable.\n");
+ }
+
+#ifdef LSEEK_NOT_LINEAR
+ {
+ char c;
+
+ /* Have to read it byte by byte to find out where the chars live */
+
+ line_charpos[0] = tell(desc);
+ nlines = 1;
+ while (myread(desc, &c, 1)>0)
+ {
+ if (c == '\n')
+ {
+ if (nlines == lines_allocated)
+ {
+ lines_allocated *= 2;
+ line_charpos =
+ (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ sizeof (int) * lines_allocated);
+ }
+ line_charpos[nlines++] = tell(desc);
+ }
+ }
}
+#else /* lseek linear. */
+ {
+ struct cleanup *old_cleanups;
-#ifdef BROKEN_LARGE_ALLOCA
- data = (char *) xmalloc (st.st_size);
- make_cleanup (free, data);
-#else
- data = (char *) alloca (st.st_size);
-#endif
- if (myread (desc, data, st.st_size) < 0)
- perror_with_name (s->filename);
- end = data + st.st_size;
- p = data;
- line_charpos[0] = 0;
- nlines = 1;
- while (p != end)
- {
- if (*p++ == '\n'
- /* A newline at the end does not start a new line. */
- && p != end)
- {
- if (nlines == lines_allocated)
- {
- lines_allocated *= 2;
- line_charpos =
+ /* st_size might be a large type, but we only support source files whose
+ size fits in an int. */
+ size = (int) st.st_size;
+
+ /* Use malloc, not alloca, because this may be pretty large, and we may
+ run into various kinds of limits on stack size. */
+ data = (char *) xmalloc (size);
+ old_cleanups = make_cleanup (free, data);
+
+ if (myread (desc, data, size) < 0)
+ perror_with_name (s->filename);
+ end = data + size;
+ p = data;
+ line_charpos[0] = 0;
+ nlines = 1;
+ while (p != end)
+ {
+ if (*p++ == '\n'
+ /* A newline at the end does not start a new line. */
+ && p != end)
+ {
+ if (nlines == lines_allocated)
+ {
+ lines_allocated *= 2;
+ line_charpos =
(int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
sizeof (int) * lines_allocated);
- }
- line_charpos[nlines++] = p - data;
- }
- }
+ }
+ line_charpos[nlines++] = p - data;
+ }
+ }
+ do_cleanups (old_cleanups);
+ }
+#endif /* lseek linear. */
s->nlines = nlines;
s->line_charpos =
- (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
- nlines * sizeof (int));
+ (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ nlines * sizeof (int));
+
}
/* Return the character position of a line LINE in symtab S.
Return 1 if successful, 0 if could not find the file. */
int
-identify_source_line (s, line, mid_statement)
+identify_source_line (s, line, mid_statement, pc)
struct symtab *s;
int line;
int mid_statement;
+ CORE_ADDR pc;
{
if (s->line_charpos == 0)
get_filename_and_charpos (s, (char **)NULL);
if (s->fullname == 0)
return 0;
- printf ("\032\032%s:%d:%d:%s:0x%x\n", s->fullname,
- line, s->line_charpos[line - 1],
- mid_statement ? "middle" : "beg",
- get_frame_pc (get_current_frame()));
+ if (line > s->nlines)
+ /* Don't index off the end of the line_charpos array. */
+ return 0;
+ annotate_source (s->fullname, line, s->line_charpos[line - 1],
+ mid_statement, pc);
+
current_source_line = line;
first_line_listed = line;
last_line_listed = line;
perror_with_name (s->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (nlines-- > 0)
printf_filtered ("%d\t", current_source_line++);
do
{
- if (c < 040 && c != '\t' && c != '\n')
+ if (c < 040 && c != '\t' && c != '\n' && c != '\r')
printf_filtered ("^%c", c + 0100);
else if (c == 0177)
printf_filtered ("^?");
\f
-/*
- C++
- 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.
- */
+/* 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. */
+
static void
ambiguous_line_spec (sals)
struct symtabs_and_lines *sals;
int i;
for (i = 0; i < sals->nelts; ++i)
- printf("file: \"%s\", line number: %d\n",
- sals->sals[i].symtab->filename, sals->sals[i].line);
+ printf_filtered("file: \"%s\", line number: %d\n",
+ sals->sals[i].symtab->filename, sals->sals[i].line);
}
-
static void
list_command (arg, from_tty)
char *arg;
/* "l" or "l +" lists next ten lines. */
- if (arg == 0 || !strcmp (arg, "+"))
+ if (arg == 0 || STREQ (arg, "+"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
}
/* "l -" lists previous ten lines, the ones before the ten just listed. */
- if (!strcmp (arg, "-"))
+ if (STREQ (arg, "-"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
dummy_beg = 1;
else
{
- sals = decode_line_1 (&arg1, 0, 0, 0);
+ sals = decode_line_1 (&arg1, 0, 0, 0, 0);
if (! sals.nelts) return; /* C++ */
if (sals.nelts > 1)
else
{
if (dummy_beg)
- sals_end = decode_line_1 (&arg1, 0, 0, 0);
+ sals_end = decode_line_1 (&arg1, 0, 0, 0, 0);
else
- sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line);
+ sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0);
if (sals_end.nelts == 0)
return;
if (sals_end.nelts > 1)
if (*arg == '*')
{
if (sal.symtab == 0)
- error ("No source file for address %s.", local_hex_string(sal.pc));
+ /* FIXME-32x64--assumes sal.pc fits in long. */
+ error ("No source file for address %s.",
+ local_hex_string((unsigned long) sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
- printf ("%s is in %s (%s:%d).\n",
- local_hex_string(sal.pc),
- SYMBOL_NAME (sym), sal.symtab->filename, sal.line);
+ {
+ print_address_numeric (sal.pc, 1, gdb_stdout);
+ printf_filtered (" is in ");
+ fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout);
+ printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
+ }
else
- printf ("%s is at %s:%d.\n",
- local_hex_string(sal.pc),
- sal.symtab->filename, sal.line);
+ {
+ print_address_numeric (sal.pc, 1, gdb_stdout);
+ printf_filtered (" is at %s:%d.\n",
+ sal.symtab->filename, sal.line);
+ }
}
/* If line was not specified by just a line number,
{
sal.symtab = current_source_symtab;
sal.line = last_line_listed;
+ sal.pc = 0;
sals.nelts = 1;
sals.sals = (struct symtab_and_line *)
xmalloc (sizeof (struct symtab_and_line));
{
sals = decode_line_spec_1 (arg, 0);
- /* If this command is repeated with RET,
- turn it into the no-arg variant. */
- if (from_tty)
- *arg = 0;
+ dont_repeat ();
}
/* C++ More than one line may have been specified, as when the user
sal = sals.sals[i];
if (sal.symtab == 0)
- error ("No source file specified.");
-
- if (sal.line > 0
- && find_line_pc_range (sal.symtab, sal.line, &start_pc, &end_pc))
+ {
+ printf_filtered ("No line number information available");
+ if (sal.pc != 0)
+ {
+ /* This is useful for "info line *0x7f34". If we can't tell the
+ user about a source line, at least let them have the symbolic
+ address. */
+ printf_filtered (" for address ");
+ wrap_here (" ");
+ print_address (sal.pc, gdb_stdout);
+ }
+ else
+ printf_filtered (".");
+ printf_filtered ("\n");
+ }
+ else if (sal.line > 0
+ && find_line_pc_range (sal, &start_pc, &end_pc))
{
if (start_pc == end_pc)
- printf ("Line %d of \"%s\" is at pc %s but contains no code.\n",
- sal.line, sal.symtab->filename, local_hex_string(start_pc));
+ {
+ printf_filtered ("Line %d of \"%s\"",
+ sal.line, sal.symtab->filename);
+ wrap_here (" ");
+ printf_filtered (" is at address ");
+ print_address (start_pc, gdb_stdout);
+ wrap_here (" ");
+ printf_filtered (" but contains no code.\n");
+ }
else
{
- printf ("Line %d of \"%s\" starts at pc %s",
- sal.line, sal.symtab->filename,
- local_hex_string(start_pc));
- printf (" and ends at %s.\n",
- local_hex_string(end_pc));
+ printf_filtered ("Line %d of \"%s\"",
+ sal.line, sal.symtab->filename);
+ wrap_here (" ");
+ printf_filtered (" starts at address ");
+ print_address (start_pc, gdb_stdout);
+ wrap_here (" ");
+ printf_filtered (" and ends at ");
+ print_address (end_pc, gdb_stdout);
+ printf_filtered (".\n");
}
+
/* x/i should display this line's code. */
set_next_address (start_pc);
+
/* Repeating "info line" should do the following line. */
last_line_listed = sal.line + 1;
+
+ /* If this is the only line, show the source code. If it could
+ not find the file, don't do anything special. */
+ if (annotation_level && sals.nelts == 1)
+ identify_source_line (sal.symtab, sal.line, 0, start_pc);
}
else
- printf ("Line number %d is out of range for \"%s\".\n",
- sal.line, sal.symtab->filename);
+ /* Is there any case in which we get here, and have an address
+ which the user would want to see? If we have debugging symbols
+ and no line numbers? */
+ printf_filtered ("Line number %d is out of range for \"%s\".\n",
+ sal.line, sal.symtab->filename);
}
+ free (sals.sals);
}
\f
/* Commands to search the source file for a regexp. */
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (1) {
-/* FIXME!!! We walk right off the end of buf if we get a long line!!! */
- char buf[4096]; /* Should be reasonable??? */
- register char *p = buf;
+ static char *buf = NULL;
+ register char *p;
+ int cursize, newsize;
+
+ cursize = 256;
+ buf = xmalloc (cursize);
+ p = buf;
c = getc (stream);
if (c == EOF)
break;
do {
*p++ = c;
+ if (p - buf == cursize)
+ {
+ newsize = cursize + cursize / 2;
+ buf = xrealloc (buf, newsize);
+ p = buf + cursize;
+ cursize = newsize;
+ }
} while (c != '\n' && (c = getc (stream)) >= 0);
/* we now have a source line in buf, null terminate and match */
{
/* Match! */
fclose (stream);
- print_source_lines (current_source_symtab,
- line, line+1, 0);
+ print_source_lines (current_source_symtab, line, line+1, 0);
+ set_internalvar (lookup_internalvar ("_"),
+ value_from_longest (builtin_type_int,
+ (LONGEST) line));
current_source_line = max (line - lines_to_list / 2, 1);
return;
}
line++;
}
- printf ("Expression not found\n");
+ printf_filtered ("Expression not found\n");
fclose (stream);
}
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (line > 1)
{
fclose (stream);
print_source_lines (current_source_symtab,
line, line+1, 0);
+ set_internalvar (lookup_internalvar ("_"),
+ value_from_longest (builtin_type_int,
+ (LONGEST) line));
current_source_line = max (line - lines_to_list / 2, 1);
return;
}
}
}
- printf ("Expression not found\n");
+ printf_filtered ("Expression not found\n");
fclose (stream);
return;
}
void
_initialize_source ()
{
+ struct cmd_list_element *c;
current_source_symtab = 0;
init_source_path ();
- add_com ("directory", class_files, directory_command,
+ /* The intention is to use POSIX Basic Regular Expressions.
+ Always use the GNU regex routine for consistency across all hosts.
+ Our current GNU regex.c does not have all the POSIX features, so this is
+ just an approximation. */
+ re_set_syntax (RE_SYNTAX_GREP);
+
+ c = add_cmd ("directory", class_files, directory_command,
"Add directory DIR to beginning of search path for source files.\n\
Forget cached info on source file locations and line positions.\n\
DIR can also be $cwd for the current working directory, or $cdir for the\n\
directory in which the source file was compiled into object code.\n\
-With no argument, reset the search path to $cdir:$cwd, the default.");
+With no argument, reset the search path to $cdir:$cwd, the default.",
+ &cmdlist);
+ c->completer = filename_completer;
add_cmd ("directories", no_class, show_directories,
"Current search path for finding source files.\n\
"Information about the current source file.");
add_info ("line", line_info,
- "Core addresses of the code for a source line.\n\
+ concat ("Core addresses of the code for a source line.\n\
Line can be specified as\n\
LINENUM, to list around that line in current file,\n\
FILE:LINENUM, to list around that line in that file,\n\
FUNCTION, to list around beginning of that function,\n\
FILE:FUNCTION, to distinguish among like-named static functions.\n\
+", "\
Default is to describe the last source line that was listed.\n\n\
This sets the default address for \"x\" to the line's first instruction\n\
so that \"x/i\" suffices to start examining the machine code.\n\
-The address is also stored as the value of \"$_\".");
+The address is also stored as the value of \"$_\".", NULL));
add_com ("forward-search", class_files, forward_search_command,
- "Search for regular expression (see regex(3)) from last line listed.");
+ "Search 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 ("search", "forward-search", class_files, 0);
add_com ("reverse-search", class_files, reverse_search_command,
- "Search backward for regular expression (see regex(3)) from last line listed.");
+ "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 ("list", class_files, list_command,
- "List specified function or line.\n\
+ concat ("List specified function or line.\n\
With no argument, lists ten more lines after or around previous listing.\n\
\"list -\" lists the ten lines before a previous ten-line listing.\n\
One argument specifies a line, and ten lines are listed around that line.\n\
Two arguments with comma between specify starting and ending lines to list.\n\
+", "\
Lines can be specified in these ways:\n\
LINENUM, to list around that line in current file,\n\
FILE:LINENUM, to list around that line in that file,\n\
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.");
- add_com_alias ("l", "list", class_files, 0);
+With two args if one is empty it stands for ten lines away from the other arg.", NULL));
+
+ add_com_alias ("l", "list", class_files, 1);
add_show_from_set
(add_set_cmd ("listsize", class_support, var_uinteger,
projects / binutils.git / blobdiff