X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsource.c;h=b86df915bc788fd2bc65390669fc3c1b2cde9fe4;hb=ebb2647017777453ac3e758f4a1192651ffa43e3;hp=ae3a70d6c12a2fbbd6b86224dbe1aaa4697f2c31;hpb=7a67dd45ca1c191a0220697a3ec9fa92993caf8c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/source.c b/gdb/source.c index ae3a70d6c1..b86df915bc 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1,40 +1,77 @@ /* List lines of source files for GDB, the GNU debugger. - Copyright (C) 1986, 1987, 1988, 1989 Free Software Foundation, Inc. + Copyright 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995 + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "defs.h" #include "symtab.h" -#include "param.h" +#include "expression.h" +#include "language.h" +#include "command.h" +#include "gdbcmd.h" +#include "frame.h" +#include "value.h" -#ifdef USG #include +#include "gdb_string.h" +#include "gdb_stat.h" #include +#ifdef HAVE_UNISTD_H +#include #endif +#include "gdbcore.h" +#include "gnu-regex.h" +#include "symfile.h" +#include "objfiles.h" +#include "annotate.h" +#include "gdbtypes.h" -#include -#include -#include +/* 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 ((char *, int)); + +static void show_directories PARAMS ((char *, 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 + 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. */ @@ -44,6 +81,14 @@ struct symtab *current_source_symtab; 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. */ @@ -54,15 +99,13 @@ static int last_line_listed; static int first_line_listed; -struct symtab *psymtab_to_symtab (); +/* Set the source file default for the "list" command to be S. -/* Set the source file default for the "list" command, specifying a - symtab. Sigh. Behaivior 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 - none of this works, report an error. */ + 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) @@ -70,7 +113,9 @@ select_source_symtab (s) { 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) { @@ -79,212 +124,351 @@ 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)) + 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 && (STREQ (&name[len - 2], ".h")))) + { + 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 && (STREQ (&name[len - 2], ".h")))) + { + 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); + } } + + error ("Can't find a default source file"); } static void -directories_info () +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. */ + 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 () +{ + char buf[20]; + + sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR); + source_path = strsave (buf); + 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 + mod_path (dirname, &source_path); + if (from_tty) + show_directories ((char *)0, from_tty); + forget_cached_source_info (); +} + +/* 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 { - dirname = tilde_expand (dirname); - make_cleanup (free, dirname); + char *name = dirname; + register char *p; + struct stat st; - do - { - extern char *index (); - char *name = dirname; - register char *p; - struct stat st; + { + char *separator = strchr (name, DIRNAME_SEPARATOR); + char *space = strchr (name, ' '); + char *tab = strchr (name, '\t'); + if (separator == 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 (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_SEPARATOR + || *dirname == ' ' + || *dirname == '\t') + ++dirname; } + } - if (p[-1] == '/') - /* Sigh. "foo/" => "foo" */ - --p; - *p = '\0'; +#ifndef WIN32 + /* On win32 h:\ is different to h: */ + if (SLASH_P (p[-1])) + /* Sigh. "foo/" => "foo" */ + --p; +#endif + *p = '\0'; - while (p[-1] == '.') + while (p[-1] == '.') + { + if (p - name == 1) + { + /* "." => getwd (). */ + name = current_directory; + goto append; + } + else if (SLASH_P (p[-2])) { - if (p - name == 1) + 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 (!ROOTED_P (name) && 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) + { + 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: + append: + { + register unsigned int len = strlen (name); + + p = *which_path; + while (1) { - register unsigned int len = strlen (name); + if (!strncmp (p, name, 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 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, DIRNAME_SEPARATOR); + if (p != 0) + ++p; + else + break; + } + if (p == 0) + { + char tinybuf[2]; + + tinybuf[0] = DIRNAME_SEPARATOR; + tinybuf[1] = '\0'; - p = source_path; - while (1) + /* 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, tinybuf, 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] ? tinybuf : 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 (ignore, from_tty) + char *ignore; + int from_tty; +{ + register struct symtab *s = current_source_symtab; + + if (!s) + { + printf_filtered("No current source file.\n"); + return; } + printf_filtered ("Current source file is %s\n", s->filename); + if (s->dirname) + printf_filtered ("Compilation directory is %s\n", s->dirname); + if (s->fullname) + printf_filtered ("Located in %s\n", s->fullname); + if (s->nlines) + printf_filtered ("Contains %d line%s.\n", s->nlines, + s->nlines == 1 ? "" : "s"); + + printf_filtered ("Source language is %s.\n", language_str (s->language)); + printf_filtered ("Compiled with %s debugging format.\n", s->debugformat); } + + -/* 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 "/" + 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. */ @@ -304,54 +488,217 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) register char *filename; register char *p, *p1; register int len; + int alloclen; if (!path) path = "."; - /* ./foo => foo */ - while (string[0] == '.' && string[1] == '/') - string += 2; +#ifdef WIN32 + mode |= O_BINARY; +#endif - 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[i])) + goto done; } - filename = (char *) alloca (strlen (path) + strlen (string) + 2); + /* ./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 *) index (p, ':'); + p1 = (char *) strchr (p, DIRNAME_SEPARATOR); 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; + } + + /* 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) { - *filename_opened = concat (current_directory, "/", filename); + 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. */ + +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] == 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); + 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); + } +#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); + 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; +} + /* Create and initialize the table S->line_charpos that records the positions of the lines in the source file, which is assumed @@ -367,43 +714,103 @@ find_source_lines (s, desc) 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; + int *line_charpos; + long 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 (get_exec_file (0) != 0 && exec_mtime < st.st_mtime) - printf ("Source file is more recent than executable.\n"); - data = (char *) alloca (st.st_size); - 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 = (int *) xrealloc (line_charpos, - sizeof (int) * lines_allocated); - } - line_charpos[nlines++] = p - data; - } + if (s && s->objfile && s->objfile->obfd) + { + mtime = bfd_get_mtime(s->objfile->obfd); + if (mtime && mtime < st.st_mtime) + printf_filtered ("Source file is more recent than executable.\n"); + } + else if (exec_bfd) + { + mtime = bfd_get_mtime(exec_bfd); + if (mtime && 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] = lseek (desc, 0, SEEK_CUR); + 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++] = lseek (desc, 0, SEEK_CUR); + } + } + } +#else /* lseek linear. */ + { + struct cleanup *old_cleanups; + + /* 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); + + /* Reassign `size' to result of read for systems where \r\n -> \n. */ + size = myread (desc, data, size); + if (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; + } + } + do_cleanups (old_cleanups); + } +#endif /* lseek linear. */ 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; @@ -438,21 +845,23 @@ source_charpos_line (s, chr) line = s->nlines; return line; } + +#endif /* 0 */ + /* 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) @@ -477,19 +886,22 @@ get_filename_and_charpos (s, line, fullname) 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, 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, - 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; @@ -511,13 +923,19 @@ print_source_lines (s, line, stopline, noerror) 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; } @@ -537,11 +955,7 @@ print_source_lines (s, line, stopline, noerror) perror_with_name (s->filename); } - current_source_symtab = s; - current_source_line = line; - first_line_listed = line; - - stream = fdopen (desc, "r"); + stream = fdopen (desc, FOPEN_RT); clearerr (stream); while (nlines-- > 0) @@ -552,7 +966,7 @@ print_source_lines (s, line, stopline, noerror) 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 ("^?"); @@ -566,13 +980,11 @@ print_source_lines (s, line, stopline, noerror) -/* - 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; @@ -580,11 +992,10 @@ ambiguous_line_spec (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; @@ -600,8 +1011,8 @@ list_command (arg, from_tty) 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 && @@ -610,22 +1021,22 @@ list_command (arg, from_tty) /* "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\"."); print_source_lines (current_source_symtab, current_source_line, - current_source_line + 10, 0); + current_source_line + lines_to_list, 0); return; } /* "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\"."); 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; } @@ -641,7 +1052,7 @@ list_command (arg, from_tty) 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) @@ -673,9 +1084,9 @@ list_command (arg, from_tty) 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) @@ -705,14 +1116,23 @@ list_command (arg, from_tty) if (*arg == '*') { if (sal.symtab == 0) - error ("No source file for address 0x%x.", 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 ("0x%x is in %s (%s, line %d).\n", - 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 ("0x%x is in %s, line %d.\n", - 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, @@ -731,15 +1151,20 @@ list_command (arg, from_tty) 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); } @@ -752,9 +1177,11 @@ line_info (arg, from_tty) { struct symtabs_and_lines sals; struct symtab_and_line sal; - int start_pc, end_pc; + CORE_ADDR start_pc, end_pc; int i; + INIT_SAL (&sal); /* initialize to zeroes */ + if (arg == 0) { sal.symtab = current_source_symtab; @@ -768,10 +1195,7 @@ line_info (arg, from_tty) { 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 @@ -781,33 +1205,75 @@ line_info (arg, from_tty) 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 0x%x but contains no code.\n", - sal.line, sal.symtab->filename, 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 0x%x and ends at 0x%x.\n", - sal.line, sal.symtab->filename, start_pc, 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); } /* 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; @@ -824,8 +1290,7 @@ forward_search_command (regex, from_tty) /* 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); @@ -844,18 +1309,30 @@ forward_search_command (regex, from_tty) perror_with_name (current_source_symtab->filename); } - stream = fdopen (desc, "r"); + stream = fdopen (desc, FOPEN_RT); clearerr (stream); while (1) { - 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 = fgetc (stream); + c = getc (stream); if (c == EOF) break; do { *p++ = c; - } while (c != '\n' && (c = fgetc (stream)) >= 0); + 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 */ *p = 0; @@ -863,21 +1340,25 @@ forward_search_command (regex, from_tty) { /* Match! */ fclose (stream); - print_source_lines (current_source_symtab, - line, line+1, 0); - current_source_line = max (line - 5, 1); + 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); } +/* ARGSUSED */ static void reverse_search_command (regex, from_tty) char *regex; + int from_tty; { register int c; register int desc; @@ -894,8 +1375,7 @@ reverse_search_command (regex, from_tty) /* 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); @@ -914,19 +1394,20 @@ reverse_search_command (regex, from_tty) perror_with_name (current_source_symtab->filename); } - stream = fdopen (desc, "r"); + stream = fdopen (desc, FOPEN_RT); 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; @@ -936,7 +1417,10 @@ reverse_search_command (regex, from_tty) fclose (stream); print_source_lines (current_source_symtab, line, line+1, 0); - current_source_line = max (line - 5, 1); + set_internalvar (lookup_internalvar ("_"), + value_from_longest (builtin_type_int, + (LONGEST) line)); + current_source_line = max (line - lines_to_list / 2, 1); return; } line--; @@ -947,7 +1431,7 @@ reverse_search_command (regex, from_tty) } } - printf ("Expression not found\n"); + printf_filtered ("Expression not found\n"); fclose (stream); return; } @@ -955,48 +1439,77 @@ reverse_search_command (regex, from_tty) void _initialize_source () { + struct cmd_list_element *c; current_source_symtab = 0; 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_info ("directories", directories_info, - "Current search path for finding source files."); + /* 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.", + &cmdlist); + c->completer = filename_completer; + + 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\ + 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."); -} +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, + (char *)&lines_to_list, + "Set number of source lines gdb will list by default.", + &setlist), + &showlist); +}