/* List lines of source files for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1988, 1989 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1988, 1989, 1991 Free Software Foundation, Inc.
This file is part of GDB.
-GDB is free software; you can redistribute it and/or modify
+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 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-GDB is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GDB; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "defs.h"
#include "symtab.h"
-#include "param.h"
+#include "expression.h"
+#include "language.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "frame.h"
#ifdef USG
#include <sys/types.h>
-#include <fcntl.h>
#endif
-#include <stdio.h>
+#include <string.h>
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/file.h>
+#include <fcntl.h>
+#include "gdbcore.h"
+#include "regex.h"
+#include "symfile.h"
+
+/* Prototypes for local functions. */
+
+static int
+open_source_file PARAMS ((struct symtab *));
+
+static int
+get_filename_and_charpos PARAMS ((struct symtab *, char **));
+
+static void
+reverse_search_command PARAMS ((char *, int));
+
+static void
+forward_search_command PARAMS ((char *, int));
+
+static void
+line_info PARAMS ((char *, int));
+
+static void
+list_command PARAMS ((char *, int));
+
+static void
+ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
+
+static void
+source_info PARAMS ((void));
+
+static void
+show_directories PARAMS ((void));
+
+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
+ to int, and possibly botch on a few systems. Thanks, ANSIholes... */
+/* extern char *strstr(); */
/* Path of directories to search for source files.
Same format as the PATH environment variable's value. */
-static char *source_path;
+char *source_path;
/* Symtab of default file for listing lines of. */
int current_source_line;
+/* Default number of lines to print with commands like "list".
+ This is based on guessing how many long (i.e. more than chars_per_line
+ characters) lines there will be. To be completely correct, "list"
+ and friends should be rewritten to count characters and see where
+ things are wrapping, but that would be a fair amount of work. */
+
+int lines_to_list = 10;
+
/* Line number of last line printed. Default for various commands.
current_source_line is usually, but not always, the same as this. */
static int first_line_listed;
\f
-struct symtab *psymtab_to_symtab ();
-
/* Set the source file default for the "list" command, specifying a
- symtab. Sigh. Behaivior specification: If it is called with 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_list (if it
- exists) or the last symtab in the psytab_list (if *it* exists). If
+ 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. */
void
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
- struct partial_symtab *ps, *cs_pst;
+ struct partial_symtab *ps;
+ struct partial_symtab *cs_pst = 0;
+ struct objfile *ofp;
if (s)
{
/* Make the default place to list be the function `main'
if one exists. */
- if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0))
+ if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL))
{
sals = decode_line_spec ("main", 1);
sal = sals.sals[0];
free (sals.sals);
current_source_symtab = sal.symtab;
- current_source_line = max (sal.line - 9, 1);
- return;
+ current_source_line = max (sal.line - (lines_to_list - 1), 1);
+ if (current_source_symtab)
+ return;
}
/* All right; find the last file in the symtab list (ignoring .h's). */
- if (s = symtab_list)
+ current_source_line = 1;
+
+ for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
{
- do
+ for (s = ofp -> symtabs; s; s = s->next)
{
- char *name = s->filename;
+ char *name = s -> filename;
int len = strlen (name);
- if (! (len > 2 && !strcmp (&name[len - 2], ".h")))
- current_source_symtab = s;
- s = s->next;
+ if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ {
+ current_source_symtab = s;
+ }
}
- while (s);
- current_source_line = 1;
}
- else if (partial_symtab_list)
+ if (current_source_symtab)
+ return;
+
+ /* Howabout the partial symbol tables? */
+
+ for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
{
- ps = partial_symtab_list;
- while (ps)
+ for (ps = ofp -> psymtabs; ps != NULL; ps = ps -> next)
{
- char *name = ps->filename;
+ char *name = ps -> filename;
int len = strlen (name);
- if (! (len > 2 && !strcmp (&name[len - 2], ".h")))
- cs_pst = ps;
- ps = ps->next;
+ if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ {
+ cs_pst = ps;
+ }
}
- if (cs_pst)
- if (cs_pst->readin)
+ }
+ if (cs_pst)
+ {
+ if (cs_pst -> readin)
+ {
fatal ("Internal: select_source_symtab: readin pst found and no symtabs.");
- else
- current_source_symtab = psymtab_to_symtab (cs_pst);
+ }
else
- current_source_symtab = 0;
- current_source_line = 1;
+ {
+ current_source_symtab = PSYMTAB_TO_SYMTAB (cs_pst);
+ }
}
+
+ if (current_source_symtab)
+ return;
+
+ error ("Can't find a default source file");
}
\f
static void
-directories_info ()
+show_directories ()
{
printf ("Source directories searched: %s\n", source_path);
}
+/* 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
-init_source_path ()
+forget_cached_source_info ()
{
register struct symtab *s;
+ register struct objfile *objfile;
- source_path = savestring (current_directory, strlen (current_directory));
+ for (objfile = object_files; objfile != NULL; objfile = objfile -> next)
+ {
+ for (s = objfile -> symtabs; s != NULL; s = s -> next)
+ {
+ if (s -> line_charpos != NULL)
+ {
+ mfree (objfile -> md, s -> line_charpos);
+ s -> line_charpos = NULL;
+ }
+ if (s -> fullname != NULL)
+ {
+ mfree (objfile -> md, s -> fullname);
+ s -> fullname = NULL;
+ }
+ }
+ }
+}
- /* Forget what we learned about line positions in source files;
- must check again now since files may be found in
- a different directory now. */
- for (s = symtab_list; s; s = s->next)
- if (s->line_charpos != 0)
- {
- free (s->line_charpos);
- s->line_charpos = 0;
- }
+void
+init_source_path ()
+{
+ source_path = savestring ("$cdir:$cwd", /* strlen of it */ 10);
+ forget_cached_source_info ();
}
+/* Add zero or more directories to the front of the source path. */
+
void
directory_command (dirname, from_tty)
char *dirname;
int from_tty;
{
- char *old = source_path;
-
dont_repeat ();
-
+ /* FIXME, this goes to "delete dir"... */
if (dirname == 0)
{
- if (query ("Reinitialize source path to %s? ", current_directory))
+ if (query ("Reinitialize source path to empty? ", ""))
{
+ free (source_path);
init_source_path ();
- free (old);
}
}
else
- {
- dirname = tilde_expand (dirname);
- make_cleanup (free, dirname);
+ mod_path (dirname, &source_path);
+ if (from_tty)
+ show_directories ();
+ forget_cached_source_info ();
+}
- do
- {
- extern char *index ();
- char *name = dirname;
- register char *p;
- struct stat st;
+/* Add zero or more directories to the front of an arbitrary path. */
+
+void
+mod_path (dirname, which_path)
+ char *dirname;
+ char **which_path;
+{
+ char *old = *which_path;
+ int prefix = 0;
+
+ if (dirname == 0)
+ return;
+ dirname = strsave (dirname);
+ make_cleanup (free, dirname);
+
+ do
+ {
+ char *name = dirname;
+ register char *p;
+ struct stat st;
+
+ {
+ char *colon = strchr (name, ':');
+ char *space = strchr (name, ' ');
+ char *tab = strchr (name, '\t');
+ if (colon == 0 && space == 0 && tab == 0)
+ p = dirname = name + strlen (name);
+ else
{
- char *colon = index (name, ':');
- char *space = index (name, ' ');
- char *tab = index (name, '\t');
- if (colon == 0 && space == 0 && tab == 0)
- p = dirname = name + strlen (name);
- else
- {
- p = 0;
- if (colon != 0 && (p == 0 || colon < p))
- p = colon;
- 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')
- ++dirname;
- }
+ p = 0;
+ if (colon != 0 && (p == 0 || colon < p))
+ p = colon;
+ 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')
+ ++dirname;
}
+ }
- if (p[-1] == '/')
- /* Sigh. "foo/" => "foo" */
- --p;
- *p = '\0';
+ if (p[-1] == '/')
+ /* Sigh. "foo/" => "foo" */
+ --p;
+ *p = '\0';
- while (p[-1] == '.')
+ while (p[-1] == '.')
+ {
+ if (p - name == 1)
{
- if (p - name == 1)
+ /* "." => getwd (). */
+ name = current_directory;
+ goto append;
+ }
+ else if (p[-2] == '/')
+ {
+ if (p - name == 2)
{
- /* "." => getwd (). */
- name = current_directory;
+ /* "/." => "/". */
+ *--p = '\0';
goto append;
}
- else if (p[-2] == '/')
+ else
{
- if (p - name == 2)
- {
- /* "/." => "/". */
- *--p = '\0';
- goto append;
- }
- else
- {
- /* "...foo/." => "...foo". */
- p -= 2;
- *p = '\0';
- continue;
- }
+ /* "...foo/." => "...foo". */
+ p -= 2;
+ *p = '\0';
+ continue;
}
- else
- break;
}
-
- if (*name != '/')
- name = concat (current_directory, "/", name);
else
- name = savestring (name, p - name);
- make_cleanup (free, name);
+ break;
+ }
- if (stat (name, &st) < 0)
- perror_with_name (name);
- if ((st.st_mode & S_IFMT) != S_IFDIR)
- error ("%s is not a directory.", name);
+ if (name[0] == '~')
+ name = tilde_expand (name);
+ else if (name[0] != '/' && name[0] != '$')
+ name = concat (current_directory, "/", name, NULL);
+ else
+ name = savestring (name, p - name);
+ make_cleanup (free, name);
+
+ /* Unless it's a variable, check existence. */
+ if (name[0] != '$') {
+ if (stat (name, &st) < 0)
+ perror_with_name (name);
+ if ((st.st_mode & S_IFMT) != S_IFDIR)
+ error ("%s is not a directory.", name);
+ }
- append:
- {
- register unsigned int len = strlen (name);
+ append:
+ {
+ register unsigned int len = strlen (name);
- p = source_path;
- while (1)
+ p = *which_path;
+ while (1)
+ {
+ if (!strncmp (p, name, len)
+ && (p[len] == '\0' || p[len] == ':'))
+ {
+ /* Found it in the search path, remove old copy */
+ if (p > *which_path)
+ p--; /* Back over leading colon */
+ 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, ':');
+ if (p != 0)
+ ++p;
+ else
+ break;
+ }
+ if (p == 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)
{
- if (!strncmp (p, name, len)
- && (p[len] == '\0' || p[len] == ':'))
- {
- if (from_tty)
- printf ("\"%s\" is already in the source path.\n", name);
- break;
- }
- p = index (p, ':');
- if (p != 0)
- ++p;
- else
- break;
+ char *temp, c;
+
+ c = old[prefix];
+ old[prefix] = '\0';
+ temp = concat (old, ":", name, NULL);
+ old[prefix] = c;
+ *which_path = concat (temp, "", &old[prefix], NULL);
+ prefix = strlen (temp);
+ free (temp);
}
- if (p == 0)
+ else
{
- source_path = concat (old, ":", name);
- free (old);
- old = source_path;
+ *which_path = concat (name, (old[0]? ":" : old), old, NULL);
+ prefix = strlen (name);
}
+ free (old);
+ old = *which_path;
}
- } while (*dirname != '\0');
- if (from_tty)
- directories_info ();
+ }
+ skip_dup: ;
+ } while (*dirname != '\0');
+}
+
+
+static void
+source_info ()
+{
+ register struct symtab *s = current_source_symtab;
+
+ if (!s)
+ {
+ printf("No current source file.\n");
+ return;
}
+ printf ("Current source file is %s\n", s->filename);
+ if (s->dirname)
+ printf ("Compilation directory is %s\n", s->dirname);
+ if (s->fullname)
+ printf ("Located in %s\n", s->fullname);
+ if (s->nlines)
+ printf ("Contains %d lines\n", s->nlines);
+
+ printf("Source language %s.\n", language_str (s->language));
}
+
+
\f
/* Open a file named STRING, searching path PATH (dir names sep by colons)
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 ".")
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 "/"
+ the actual file opened (this string will always start with a "/". We
+ have to take special pains to avoid doubling the "/" between the directory
+ and the file, sigh! Emacs gets confuzzed by this when we print the
+ source file name!!!
If a file is found, return the descriptor.
Otherwise, return -1, with errno set for the last name we tried to open. */
register char *filename;
register char *p, *p1;
register int len;
+ int alloclen;
if (!path)
path = ".";
goto done;
}
- filename = (char *) alloca (strlen (path) + strlen (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 *) index (p, ':');
+ p1 = (char *) strchr (p, ':');
if (p1)
len = p1 - p;
else
len = strlen (p);
- strncpy (filename, p, len);
- filename[len] = 0;
- strcat (filename, "/");
+ if (len == 4 && p[0] == '$' && p[1] == 'c'
+ && p[2] == 'w' && p[3] == 'd') {
+ /* Name is $cwd -- insert current directory name instead. */
+ int newlen;
+
+ /* First, realloc the filename buffer if too short. */
+ len = strlen (current_directory);
+ newlen = len + strlen (string) + 2;
+ if (newlen > alloclen) {
+ alloclen = newlen;
+ filename = (char *) alloca (alloclen);
+ }
+ strcpy (filename, current_directory);
+ } else {
+ /* Normal file name in path -- just use it. */
+ strncpy (filename, p, len);
+ 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, "/");
strcat (filename, string);
fd = open (filename, mode, prot);
*filename_opened = savestring (filename, strlen (filename));
else
{
- *filename_opened = concat (current_directory, "/", filename);
+ /* Beware the // my son, the Emacs barfs, the botch that catch... */
+
+ *filename_opened = concat (current_directory,
+ '/' == current_directory[strlen(current_directory)-1]? "": "/",
+ filename, NULL);
}
return fd;
}
+
+/* Open a source file given a symtab S. Returns a file descriptor
+ or negative number for error. */
+
+static int
+open_source_file (s)
+ struct symtab *s;
+{
+ char *path = source_path;
+ char *p;
+ int result;
+ char *fullname;
+
+ /* Quick way out if we already know its full name */
+ if (s->fullname)
+ {
+ result = open (s->fullname, O_RDONLY);
+ if (result >= 0)
+ return result;
+ /* Didn't work -- free old one, try again. */
+ mfree (s->objfile->md, s->fullname);
+ s->fullname = NULL;
+ }
+
+ if (s->dirname != NULL)
+ {
+ /* Replace a path entry of $cdir with the compilation directory name */
+#define cdir_len 5
+ /* 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 */
+ }
+ }
+
+ result = openp (path, 0, s->filename, O_RDONLY, 0, &s->fullname);
+ if (result < 0)
+ {
+ /* 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);
+ }
+ if (result >= 0)
+ {
+ fullname = s -> fullname;
+ s -> fullname = mstrsave (s -> objfile -> md, s -> fullname);
+ free (fullname);
+ }
+ return result;
+}
+
\f
/* Create and initialize the table S->line_charpos that records
the positions of the lines in the source file, which is assumed
register char *data, *p, *end;
int nlines = 0;
int lines_allocated = 1000;
- int *line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
- extern int exec_mtime;
-
- fstat (desc, &st);
- if (get_exec_file (0) != 0 && exec_mtime < st.st_mtime)
- printf ("Source file is more recent than executable.\n");
+ int *line_charpos;
+ long exec_mtime;
+
+ 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");
+ }
+#ifdef BROKEN_LARGE_ALLOCA
+ data = (char *) xmalloc (st.st_size);
+ make_cleanup (free, data);
+#else
data = (char *) alloca (st.st_size);
- myread (desc, data, 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;
if (nlines == lines_allocated)
{
lines_allocated *= 2;
- line_charpos = (int *) xrealloc (line_charpos,
- sizeof (int) * lines_allocated);
+ line_charpos =
+ (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ sizeof (int) * lines_allocated);
}
line_charpos[nlines++] = p - data;
}
}
s->nlines = nlines;
- s->line_charpos = (int *) xrealloc (line_charpos, nlines * sizeof (int));
+ s->line_charpos =
+ (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ nlines * sizeof (int));
}
/* Return the character position of a line LINE in symtab S.
Return 0 if anything is invalid. */
+#if 0 /* Currently unused */
+
int
source_line_charpos (s, line)
struct symtab *s;
line = s->nlines;
return line;
}
+
+#endif /* 0 */
+
\f
/* Get full pathname and line number positions for a symtab.
Return nonzero if line numbers may have changed.
Set *FULLNAME to actual name of the file as found by `openp',
or to 0 if the file is not found. */
-int
-get_filename_and_charpos (s, line, fullname)
+static int
+get_filename_and_charpos (s, fullname)
struct symtab *s;
- int line;
char **fullname;
{
register int desc, linenums_changed = 0;
- desc = openp (source_path, 0, s->filename, O_RDONLY, 0, &s->fullname);
+ desc = open_source_file (s);
if (desc < 0)
{
if (fullname)
int mid_statement;
{
if (s->line_charpos == 0)
- get_filename_and_charpos (s, line, 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,
register FILE *stream;
int nlines = stopline - line;
- desc = openp (source_path, 0, s->filename, O_RDONLY, 0, &s->fullname);
+ /* Regardless of whether we can open the file, set current_source_symtab. */
+ current_source_symtab = s;
+ current_source_line = line;
+ first_line_listed = line;
+
+ desc = open_source_file (s);
if (desc < 0)
{
- extern int errno;
- if (! noerror)
- perror_with_name (s->filename);
- print_sys_errmsg (s->filename, errno);
+ if (! noerror) {
+ char *name = alloca (strlen (s->filename) + 100);
+ sprintf (name, "%s:%d", s->filename, line);
+ print_sys_errmsg (name, errno);
+ }
return;
}
if (line < 1 || line > s->nlines)
{
close (desc);
- error ("Line number out of range; %s has %d lines.",
- s->filename, s->nlines);
+ error ("Line number %d out of range; %s has %d lines.",
+ line, s->filename, s->nlines);
}
if (lseek (desc, s->line_charpos[line - 1], 0) < 0)
perror_with_name (s->filename);
}
- current_source_symtab = s;
- current_source_line = line;
- first_line_listed = line;
-
stream = fdopen (desc, "r");
clearerr (stream);
int linenum_beg = 0;
char *p;
- if (symtab_list == 0 && partial_symtab_list == 0)
- error ("No symbol table is loaded. Use the \"symbol-file\" command.");
+ if (!have_full_symbols () && !have_partial_symbols())
+ error ("No symbol table is loaded. Use the \"file\" command.");
/* Pull in a current source symtab if necessary */
if (current_source_symtab == 0 &&
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
print_source_lines (current_source_symtab, current_source_line,
- current_source_line + 10, 0);
+ current_source_line + lines_to_list, 0);
return;
}
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
print_source_lines (current_source_symtab,
- max (first_line_listed - 10, 1),
+ max (first_line_listed - lines_to_list, 1),
first_line_listed, 0);
return;
}
if (*arg == '*')
{
if (sal.symtab == 0)
- error ("No source file for address 0x%x.", sal.pc);
+ error ("No source file for address %s.", local_hex_string(sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
- printf ("0x%x is in %s (%s, line %d).\n",
- sal.pc, SYMBOL_NAME (sym), sal.symtab->filename, sal.line);
+ printf ("%s is in %s (%s:%d).\n",
+ local_hex_string(sal.pc),
+ SYMBOL_NAME (sym), sal.symtab->filename, sal.line);
else
- printf ("0x%x is in %s, line %d.\n",
- sal.pc, sal.symtab->filename, sal.line);
+ printf ("%s is at %s:%d.\n",
+ local_hex_string(sal.pc),
+ sal.symtab->filename, sal.line);
}
/* If line was not specified by just a line number,
if (dummy_beg && sal_end.symtab == 0)
error ("No default source file yet. Do \"help list\".");
if (dummy_beg)
- print_source_lines (sal_end.symtab, max (sal_end.line - 9, 1),
+ print_source_lines (sal_end.symtab,
+ max (sal_end.line - (lines_to_list - 1), 1),
sal_end.line + 1, 0);
else if (sal.symtab == 0)
error ("No default source file yet. Do \"help list\".");
else if (no_end)
- print_source_lines (sal.symtab, max (sal.line - 5, 1), sal.line + 5, 0);
+ print_source_lines (sal.symtab,
+ max (sal.line - (lines_to_list / 2), 1),
+ sal.line + (lines_to_list / 2), 0);
else
print_source_lines (sal.symtab, sal.line,
- dummy_end ? sal.line + 10 : sal_end.line + 1,
+ (dummy_end
+ ? sal.line + lines_to_list
+ : sal_end.line + 1),
0);
}
\f
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
- int start_pc, end_pc;
+ CORE_ADDR start_pc, end_pc;
int i;
if (arg == 0)
&& find_line_pc_range (sal.symtab, sal.line, &start_pc, &end_pc))
{
if (start_pc == end_pc)
- printf ("Line %d of \"%s\" is at pc 0x%x but contains no code.\n",
- sal.line, sal.symtab->filename, start_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));
else
- printf ("Line %d of \"%s\" starts at pc 0x%x and ends at 0x%x.\n",
- sal.line, sal.symtab->filename, start_pc, end_pc);
+ {
+ 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));
+ }
/* x/i should display this line's code. */
set_next_address (start_pc);
/* Repeating "info line" should do the following line. */
\f
/* Commands to search the source file for a regexp. */
+/* ARGSUSED */
static void
forward_search_command (regex, from_tty)
char *regex;
+ int from_tty;
{
register int c;
register int desc;
/* Search from last_line_listed+1 in current_source_symtab */
- desc = openp (source_path, 0, current_source_symtab->filename,
- O_RDONLY, 0, ¤t_source_symtab->fullname);
+ desc = open_source_file (current_source_symtab);
if (desc < 0)
perror_with_name (current_source_symtab->filename);
stream = fdopen (desc, "r");
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;
- c = fgetc (stream);
+ c = getc (stream);
if (c == EOF)
break;
do {
*p++ = c;
- } while (c != '\n' && (c = fgetc (stream)) >= 0);
+ } while (c != '\n' && (c = getc (stream)) >= 0);
/* we now have a source line in buf, null terminate and match */
*p = 0;
fclose (stream);
print_source_lines (current_source_symtab,
line, line+1, 0);
- current_source_line = max (line - 5, 1);
+ current_source_line = max (line - lines_to_list / 2, 1);
return;
}
line++;
fclose (stream);
}
+/* ARGSUSED */
static void
reverse_search_command (regex, from_tty)
char *regex;
+ int from_tty;
{
register int c;
register int desc;
/* Search from last_line_listed-1 in current_source_symtab */
- desc = openp (source_path, 0, current_source_symtab->filename,
- O_RDONLY, 0, ¤t_source_symtab->fullname);
+ desc = open_source_file (current_source_symtab);
if (desc < 0)
perror_with_name (current_source_symtab->filename);
stream = fdopen (desc, "r");
clearerr (stream);
- while (1)
+ while (line > 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;
- c = fgetc (stream);
+ c = getc (stream);
if (c == EOF)
break;
do {
*p++ = c;
- } while (c != '\n' && (c = fgetc (stream)) >= 0);
+ } while (c != '\n' && (c = getc (stream)) >= 0);
/* We now have a source line in buf; null terminate and match. */
*p = 0;
fclose (stream);
print_source_lines (current_source_symtab,
line, line+1, 0);
- current_source_line = max (line - 5, 1);
+ current_source_line = max (line - lines_to_list / 2, 1);
return;
}
line--;
init_source_path ();
add_com ("directory", class_files, directory_command,
- "Add directory DIR to end of search path for source files.\n\
-With no argument, reset the search path to just the working directory\n\
-and forget cached info on line positions in source files.");
+ "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.");
- add_info ("directories", directories_info,
- "Current search path for finding source files.");
+ add_cmd ("directories", no_class, show_directories,
+ "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.",
+ &showlist);
+
+ add_info ("source", source_info,
+ "Information about the current source file.");
add_info ("line", line_info,
"Core addresses of the code for a source line.\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);
+
+ add_show_from_set
+ (add_set_cmd ("listsize", class_support, var_uinteger,
+ (char *)&lines_to_list,
+ "Set number of source lines gdb will list by default.",
+ &setlist),
+ &showlist);
}
-
projects / deliverable / binutils-gdb.git / blobdiff