X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsource.c;h=34ed01c270ec3d11b630eda65b4f458e19d3d12f;hb=d17d003345eb4816548ff9da5c97fb7a76df714e;hp=4a64c5529dd4681633b1d2e07658e50f5100d404;hpb=8e65ff28b0780a52bdbe067b6297a66f9ec4e16e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/source.c b/gdb/source.c index 4a64c5529d..34ed01c270 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1,5 +1,7 @@ /* List lines of source files for GDB, the GNU debugger. - Copyright 1986-1989, 1991-1999, 2001 Free Software Foundation, Inc. + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of GDB. @@ -39,16 +41,10 @@ #include "annotate.h" #include "gdbtypes.h" #include "linespec.h" +#include "filenames.h" /* for DOSish file names */ #include "completer.h" -#ifdef UI_OUT #include "ui-out.h" -#endif - -#ifdef CRLF_SOURCE_FILES - -/* Define CRLF_SOURCE_FILES in an xm-*.h file if source files on the - host use \r\n rather than just \n. Defining CRLF_SOURCE_FILES is - much faster than defining LSEEK_NOT_LINEAR. */ +#include "readline/readline.h" #ifndef O_BINARY #define O_BINARY 0 @@ -57,13 +53,6 @@ #define OPEN_MODE (O_RDONLY | O_BINARY) #define FDOPEN_MODE FOPEN_RB -#else /* ! defined (CRLF_SOURCE_FILES) */ - -#define OPEN_MODE O_RDONLY -#define FDOPEN_MODE FOPEN_RT - -#endif /* ! defined (CRLF_SOURCE_FILES) */ - /* Prototypes for exported functions. */ void _initialize_source (void); @@ -78,10 +67,6 @@ static void forward_search_command (char *, int); static void line_info (char *, int); -static void list_command (char *, int); - -static void ambiguous_line_spec (struct symtabs_and_lines *); - static void source_info (char *, int); static void show_directories (char *, int); @@ -93,11 +78,11 @@ char *source_path; /* Symtab of default file for listing lines of. */ -struct symtab *current_source_symtab; +static struct symtab *current_source_symtab; /* Default next line to list. */ -int current_source_line; +static 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 @@ -122,6 +107,93 @@ static int first_line_listed; static struct symtab *last_source_visited = NULL; static int last_source_error = 0; +/* Return the first line listed by print_source_lines. + Used by command interpreters to request listing from + a previous point. */ + +int +get_first_line_listed (void) +{ + return first_line_listed; +} + +/* Return the default number of lines to print with commands like the + cli "list". The caller of print_source_lines must use this to + calculate the end line and use it in the call to print_source_lines + as it does not automatically use this value. */ + +int +get_lines_to_list (void) +{ + return lines_to_list; +} + +/* Return the current source file for listing and next line to list. + NOTE: The returned sal pc and end fields are not valid. */ + +struct symtab_and_line +get_current_source_symtab_and_line (void) +{ + struct symtab_and_line cursal; + + cursal.symtab = current_source_symtab; + cursal.line = current_source_line; + cursal.pc = 0; + cursal.end = 0; + + return cursal; +} + +/* If the current source file for listing is not set, try and get a default. + Usually called before get_current_source_symtab_and_line() is called. + It may err out if a default cannot be determined. + We must be cautious about where it is called, as it can recurse as the + process of determining a new default may call the caller! + Use get_current_source_symtab_and_line only to get whatever + we have without erroring out or trying to get a default. */ + +void +set_default_source_symtab_and_line (void) +{ + struct symtab_and_line cursal; + + 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) + select_source_symtab (0); +} + +/* Return the current default file for listing and next line to list + (the returned sal pc and end fields are not valid.) + and set the current default to whatever is in SAL. + NOTE: The returned sal pc and end fields are not valid. */ + +struct symtab_and_line +set_current_source_symtab_and_line (const struct symtab_and_line *sal) +{ + struct symtab_and_line cursal; + + cursal.symtab = current_source_symtab; + cursal.line = current_source_line; + + current_source_symtab = sal->symtab; + current_source_line = sal->line; + cursal.pc = 0; + cursal.end = 0; + + return cursal; +} + +/* Reset any information stored about a default file and line to print. */ + +void +clear_current_source_symtab_and_line (void) +{ + current_source_symtab = 0; + current_source_line = 0; +} /* Set the source file default for the "list" command to be S. @@ -132,7 +204,7 @@ static int last_source_error = 0; before we need to would make things slower than necessary. */ void -select_source_symtab (register struct symtab *s) +select_source_symtab (struct symtab *s) { struct symtabs_and_lines sals; struct symtab_and_line sal; @@ -152,9 +224,9 @@ select_source_symtab (register struct symtab *s) /* Make the default place to list be the function `main' if one exists. */ - if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL)) + if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0, NULL)) { - sals = decode_line_spec ("main", 1); + sals = decode_line_spec (main_name (), 1); sal = sals.sals[0]; xfree (sals.sals); current_source_symtab = sal.symtab; @@ -173,7 +245,7 @@ select_source_symtab (register struct symtab *s) { char *name = s->filename; int len = strlen (name); - if (!(len > 2 && (STREQ (&name[len - 2], ".h")))) + if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h")))) { current_source_symtab = s; } @@ -190,7 +262,7 @@ select_source_symtab (register struct symtab *s) { char *name = ps->filename; int len = strlen (name); - if (!(len > 2 && (STREQ (&name[len - 2], ".h")))) + if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h")))) { cs_pst = ps; } @@ -230,8 +302,9 @@ show_directories (char *ignore, int from_tty) void forget_cached_source_info (void) { - register struct symtab *s; - register struct objfile *objfile; + struct symtab *s; + struct objfile *objfile; + struct partial_symtab *pst; for (objfile = object_files; objfile != NULL; objfile = objfile->next) { @@ -239,15 +312,24 @@ forget_cached_source_info (void) { if (s->line_charpos != NULL) { - mfree (objfile->md, s->line_charpos); + xfree (s->line_charpos); s->line_charpos = NULL; } if (s->fullname != NULL) { - mfree (objfile->md, s->fullname); + xfree (s->fullname); s->fullname = NULL; } } + + ALL_OBJFILE_PSYMTABS (objfile, pst) + { + if (pst->fullname != NULL) + { + xfree (pst->fullname); + pst->fullname = NULL; + } + } } } @@ -261,6 +343,12 @@ init_source_path (void) forget_cached_source_info (); } +void +init_last_source_visited (void) +{ + last_source_visited = NULL; +} + /* Add zero or more directories to the front of the source path. */ void @@ -290,6 +378,18 @@ directory_command (char *dirname, int from_tty) void mod_path (char *dirname, char **which_path) +{ + add_path (dirname, which_path, 1); +} + +/* Workhorse of mod_path. Takes an extra argument to determine + if dirname should be parsed for separators that indicate multiple + directories. This allows for interfaces that pre-parse the dirname + and allow specification of traditional separator characters such + as space or tab. */ + +void +add_path (char *dirname, char **which_path, int parse_separators) { char *old = *which_path; int prefix = 0; @@ -303,13 +403,20 @@ mod_path (char *dirname, char **which_path) do { char *name = dirname; - register char *p; + char *p; struct stat st; { - char *separator = strchr (name, DIRNAME_SEPARATOR); - char *space = strchr (name, ' '); - char *tab = strchr (name, '\t'); + char *separator = NULL; + char *space = NULL; + char *tab = NULL; + + if (parse_separators) + { + separator = strchr (name, DIRNAME_SEPARATOR); + space = strchr (name, ' '); + tab = strchr (name, '\t'); + } if (separator == 0 && space == 0 && tab == 0) p = dirname = name + strlen (name); @@ -330,12 +437,12 @@ mod_path (char *dirname, char **which_path) } } - if (!(SLASH_P (*name) && p <= name + 1) /* "/" */ -#if defined(_WIN32) || defined(__MSDOS__) + if (!(IS_DIR_SEPARATOR (*name) && p <= name + 1) /* "/" */ +#ifdef HAVE_DOS_BASED_FILE_SYSTEM /* On MS-DOS and MS-Windows, h:\ is different from h: */ - && !(!SLASH_P (*name) && ROOTED_P (name) && p <= name + 3) /* d:/ */ + && !(p == name + 3 && name[1] == ':') /* "d:/" */ #endif - && SLASH_P (p[-1])) + && IS_DIR_SEPARATOR (p[-1])) /* Sigh. "foo/" => "foo" */ --p; *p = '\0'; @@ -348,7 +455,7 @@ mod_path (char *dirname, char **which_path) name = current_directory; goto append; } - else if (p > name + 1 && SLASH_P (p[-2])) + else if (p > name + 1 && IS_DIR_SEPARATOR (p[-2])) { if (p - name == 2) { @@ -370,11 +477,11 @@ mod_path (char *dirname, char **which_path) if (name[0] == '~') name = tilde_expand (name); -#if defined(_WIN32) || defined(__MSDOS__) - else if (ROOTED_P (name) && p == name + 2) /* "d:" => "d:." */ +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */ name = concat (name, ".", NULL); #endif - else if (!ROOTED_P (name) && name[0] != '$') + else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$') name = concat (current_directory, SLASH_STRING, name, NULL); else name = savestring (name, p - name); @@ -404,7 +511,7 @@ mod_path (char *dirname, char **which_path) append: { - register unsigned int len = strlen (name); + unsigned int len = strlen (name); p = *which_path; while (1) @@ -440,7 +547,8 @@ mod_path (char *dirname, char **which_path) 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 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) { char *temp, c; @@ -471,7 +579,7 @@ mod_path (char *dirname, char **which_path) static void source_info (char *ignore, int from_tty) { - register struct symtab *s = current_source_symtab; + struct symtab *s = current_source_symtab; if (!s) { @@ -489,21 +597,46 @@ source_info (char *ignore, int from_tty) printf_filtered ("Source language is %s.\n", language_str (s->language)); printf_filtered ("Compiled with %s debugging format.\n", s->debugformat); + printf_filtered ("%s preprocessor macro info.\n", + s->macro_table ? "Includes" : "Does not include"); } +/* Return True if the file NAME exists and is a regular file */ +static int +is_regular_file (const char *name) +{ + struct stat st; + const int status = stat (name, &st); + + /* Stat should never fail except when the file does not exist. + If stat fails, analyze the source of error and return True + unless the file does not exist, to avoid returning false results + on obscure systems where stat does not work as expected. + */ + if (status != 0) + return (errno != ENOENT); + + return S_ISREG (st.st_mode); +} /* 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. + OPTS specifies the function behaviour in specific cases. + + If OPF_TRY_CWD_FIRST, try to open ./STRING before searching PATH. (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 OPTS has OPF_SEARCH_IN_PATH set, absolute names will also be + searched in path (we usually want this for source files but not for + executables). + If FILENAME_OPENED is non-null, set it to a newly allocated string naming - the actual file opened (this string will always start with a "/". We + 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!!! @@ -512,46 +645,62 @@ source_info (char *ignore, int from_tty) Otherwise, return -1, with errno set for the last name we tried to open. */ /* >>>> This should only allow files of certain types, - >>>> eg executable, non-directory */ + >>>> eg executable, non-directory */ int -openp (char *path, int try_cwd_first, char *string, int mode, int prot, +openp (const char *path, int opts, const char *string, + int mode, int prot, char **filename_opened) { - register int fd; - register char *filename; - register char *p, *p1; - register int len; + int fd; + char *filename; + const char *p; + const char *p1; + int len; int alloclen; if (!path) path = "."; -#ifdef _WIN32 mode |= O_BINARY; -#endif - if (try_cwd_first || ROOTED_P (string)) + if ((opts & OPF_TRY_CWD_FIRST) || IS_ABSOLUTE_PATH (string)) { int i; - filename = string; - fd = open (filename, mode, prot); - if (fd >= 0) - goto done; - for (i = 0; string[i]; i++) - if (SLASH_P (string[i])) - goto done; + + if (is_regular_file (string)) + { + filename = alloca (strlen (string) + 1); + strcpy (filename, string); + fd = open (filename, mode, prot); + if (fd >= 0) + goto done; + } + else + { + filename = NULL; + fd = -1; + } + + if (!(opts & OPF_SEARCH_IN_PATH)) + for (i = 0; string[i]; i++) + if (IS_DIR_SEPARATOR (string[i])) + goto done; } + /* /foo => foo, to avoid multiple slashes that Emacs doesn't like. */ + while (IS_DIR_SEPARATOR(string[0])) + string++; + /* ./foo => foo */ - while (string[0] == '.' && SLASH_P (string[1])) + while (string[0] == '.' && IS_DIR_SEPARATOR (string[1])) string += 2; alloclen = strlen (path) + strlen (string) + 2; - filename = (char *) alloca (alloclen); + filename = alloca (alloclen); fd = -1; for (p = path; p; p = p1 ? p1 + 1 : 0) { - p1 = (char *) strchr (p, DIRNAME_SEPARATOR); + p1 = strchr (p, DIRNAME_SEPARATOR); if (p1) len = p1 - p; else @@ -569,7 +718,7 @@ openp (char *path, int try_cwd_first, char *string, int mode, int prot, if (newlen > alloclen) { alloclen = newlen; - filename = (char *) alloca (alloclen); + filename = alloca (alloclen); } strcpy (filename, current_directory); } @@ -581,50 +730,44 @@ openp (char *path, int try_cwd_first, char *string, int mode, int prot, } /* Remove trailing slashes */ - while (len > 0 && SLASH_P (filename[len - 1])) + while (len > 0 && IS_DIR_SEPARATOR (filename[len - 1])) filename[--len] = 0; strcat (filename + len, SLASH_STRING); strcat (filename, string); - fd = open (filename, mode); - if (fd >= 0) - break; + if (is_regular_file (filename)) + { + fd = open (filename, mode); + if (fd >= 0) + break; + } } done: if (filename_opened) { + /* If a file was opened, canonicalize its filename. Use xfullpath + rather than gdb_realpath to avoid resolving the basename part + of filenames when the associated file is a symbolic link. This + fixes a potential inconsistency between the filenames known to + GDB and the filenames it prints in the annotations. */ if (fd < 0) - *filename_opened = (char *) 0; - else if (ROOTED_P (filename)) - *filename_opened = savestring (filename, strlen (filename)); + *filename_opened = NULL; + else if (IS_ABSOLUTE_PATH (filename)) + *filename_opened = xfullpath (filename); else { /* Beware the // my son, the Emacs barfs, the botch that catch... */ - *filename_opened = concat (current_directory, - SLASH_P (current_directory[strlen (current_directory) - 1]) - ? "" : SLASH_STRING, - filename, NULL); + char *f = concat (current_directory, + IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) + ? "" : SLASH_STRING, + filename, NULL); + *filename_opened = xfullpath (f); + xfree (f); } } -#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) - { - 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; } @@ -640,14 +783,14 @@ done: If the file was found, this function returns 1, and FULL_PATHNAME is set to the fully-qualified pathname. - Else, this functions returns 0, and FULL_PATHNAME is set to NULL. - */ + Else, this functions returns 0, and FULL_PATHNAME is set to NULL. */ int source_full_path_of (char *filename, char **full_pathname) { int fd; - fd = openp (source_path, 1, filename, O_RDONLY, 0, full_pathname); + fd = openp (source_path, OPF_TRY_CWD_FIRST | OPF_SEARCH_IN_PATH, filename, + O_RDONLY, 0, full_pathname); if (fd < 0) { *full_pathname = NULL; @@ -658,30 +801,46 @@ source_full_path_of (char *filename, char **full_pathname) return 1; } +/* This function is capable of finding the absolute path to a + source file, and opening it, provided you give it an + OBJFILE and FILENAME. Both the DIRNAME and FULLNAME are only + added suggestions on where to find the file. -/* Open a source file given a symtab S. Returns a file descriptor or - negative number for error. */ + OBJFILE should be the objfile associated with a psymtab or symtab. + FILENAME should be the filename to open. + DIRNAME is the compilation directory of a particular source file. + Only some debug formats provide this info. + FULLNAME can be the last known absolute path to the file in question. + On Success + A valid file descriptor is returned. ( the return value is positive ) + FULLNAME is set to the absolute path to the file just opened. + + On Failure + A non valid file descriptor is returned. ( the return value is negitive ) + FULLNAME is set to NULL. */ int -open_source_file (struct symtab *s) +find_and_open_source (struct objfile *objfile, + const char *filename, + const char *dirname, + char **fullname) { char *path = source_path; - char *p; + const char *p; int result; - char *fullname; /* Quick way out if we already know its full name */ - if (s->fullname) + if (*fullname) { - result = open (s->fullname, OPEN_MODE); + result = open (*fullname, OPEN_MODE); if (result >= 0) return result; /* Didn't work -- free old one, try again. */ - mfree (s->objfile->md, s->fullname); - s->fullname = NULL; + xfree (*fullname); + *fullname = NULL; } - if (s->dirname != NULL) + if (dirname != NULL) { /* Replace a path entry of $cdir with the compilation directory name */ #define cdir_len 5 @@ -694,77 +853,106 @@ open_source_file (struct symtab *s) int len; path = (char *) - alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1); + alloca (strlen (source_path) + 1 + strlen (dirname) + 1); len = p - source_path; strncpy (path, source_path, len); /* Before $cdir */ - strcpy (path + len, s->dirname); /* new stuff */ + strcpy (path + len, dirname); /* new stuff */ strcat (path + len, source_path + len + cdir_len); /* After $cdir */ } } - result = openp (path, 0, s->filename, OPEN_MODE, 0, &s->fullname); + result = openp (path, OPF_SEARCH_IN_PATH, filename, OPEN_MODE, 0, 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, OPEN_MODE, 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, OPEN_MODE, 0, &s->fullname); + p = lbasename (filename); + if (p != filename) + result = openp (path, OPF_SEARCH_IN_PATH, p, OPEN_MODE, 0, 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, OPEN_MODE, 0, &s->fullname); - } -#endif /* MPW */ if (result >= 0) { - fullname = s->fullname; - s->fullname = mstrsave (s->objfile->md, s->fullname); - xfree (fullname); + char *tmp_fullname; + tmp_fullname = *fullname; + *fullname = xstrdup (tmp_fullname); + xfree (tmp_fullname); } return result; } -/* Return the path to the source file associated with symtab. Returns NULL - if no symtab. */ +/* Open a source file given a symtab S. Returns a file descriptor or + negative number for error. + + This function is a convience function to find_and_open_source. */ +int +open_source_file (struct symtab *s) +{ + if (!s) + return -1; + + return find_and_open_source (s->objfile, s->filename, s->dirname, + &s->fullname); +} + +/* Finds the fullname that a symtab represents. + + If this functions finds the fullname, it will save it in ps->fullname + and it will also return the value. + + If this function fails to find the file that this symtab represents, + NULL will be returned and ps->fullname will be set to NULL. */ char * -symtab_to_filename (struct symtab *s) +symtab_to_fullname (struct symtab *s) { - int fd; + int r; if (!s) return NULL; - /* If we've seen the file before, just return fullname. */ + /* Don't check s->fullname here, the file could have been + deleted/moved/..., look for it again */ + r = find_and_open_source (s->objfile, s->filename, s->dirname, + &s->fullname); - if (s->fullname) - return s->fullname; + if (r) + { + close (r); + return s->fullname; + } - /* Try opening the file to setup fullname */ + return NULL; +} - fd = open_source_file (s); - if (fd < 0) - return s->filename; /* File not found. Just use short name */ +/* Finds the fullname that a partial_symtab represents. - /* Found the file. Cleanup and return the full name */ + If this functions finds the fullname, it will save it in ps->fullname + and it will also return the value. - close (fd); - return s->fullname; + If this function fails to find the file that this partial_symtab represents, + NULL will be returned and ps->fullname will be set to NULL. */ +char * +psymtab_to_fullname (struct partial_symtab *ps) +{ + int r; + + if (!ps) + return NULL; + + /* Don't check ps->fullname here, the file could have been + deleted/moved/..., look for it again */ + r = find_and_open_source (ps->objfile, ps->filename, ps->dirname, + &ps->fullname); + + if (r) + { + close (r); + return ps->fullname; + } + + return NULL; } - /* Create and initialize the table S->line_charpos that records the positions of the lines in the source file, which is assumed to be open on descriptor DESC. @@ -774,15 +962,14 @@ void find_source_lines (struct symtab *s, int desc) { struct stat st; - register char *data, *p, *end; + char *data, *p, *end; int nlines = 0; int lines_allocated = 1000; int *line_charpos; long mtime = 0; int size; - line_charpos = (int *) xmmalloc (s->objfile->md, - lines_allocated * sizeof (int)); + line_charpos = (int *) xmalloc (lines_allocated * sizeof (int)); if (fstat (desc, &st) < 0) perror_with_name (s->filename); @@ -793,8 +980,6 @@ find_source_lines (struct symtab *s, int desc) if (mtime && mtime < st.st_mtime) { - if (tui_version) - printf_filtered ("\n"); warning ("Source file is more recent than executable.\n"); } @@ -814,8 +999,8 @@ find_source_lines (struct symtab *s, int desc) { lines_allocated *= 2; line_charpos = - (int *) xmrealloc (s->objfile->md, (char *) line_charpos, - sizeof (int) * lines_allocated); + (int *) xrealloc ((char *) line_charpos, + sizeof (int) * lines_allocated); } line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR); } @@ -852,8 +1037,8 @@ find_source_lines (struct symtab *s, int desc) { lines_allocated *= 2; line_charpos = - (int *) xmrealloc (s->objfile->md, (char *) line_charpos, - sizeof (int) * lines_allocated); + (int *) xrealloc ((char *) line_charpos, + sizeof (int) * lines_allocated); } line_charpos[nlines++] = p - data; } @@ -863,8 +1048,7 @@ find_source_lines (struct symtab *s, int desc) #endif /* lseek linear. */ s->nlines = nlines; s->line_charpos = - (int *) xmrealloc (s->objfile->md, (char *) line_charpos, - nlines * sizeof (int)); + (int *) xrealloc ((char *) line_charpos, nlines * sizeof (int)); } @@ -888,10 +1072,10 @@ source_line_charpos (struct symtab *s, int line) /* Return the line number of character position POS in symtab S. */ int -source_charpos_line (register struct symtab *s, register int chr) +source_charpos_line (struct symtab *s, int chr) { - register int line = 0; - register int *lnp; + int line = 0; + int *lnp; if (s == 0 || s->line_charpos == 0) return 0; @@ -918,7 +1102,7 @@ source_charpos_line (register struct symtab *s, register int chr) static int get_filename_and_charpos (struct symtab *s, char **fullname) { - register int desc, linenums_changed = 0; + int desc, linenums_changed = 0; desc = open_source_file (s); if (desc < 0) @@ -976,9 +1160,9 @@ static void print_source_lines_base (struct symtab *s, int line, int stopline, static void print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) { - register int c; - register int desc; - register FILE *stream; + int c; + int desc; + FILE *stream; int nlines = stopline - line; /* Regardless of whether we can open the file, set current_source_symtab. */ @@ -986,11 +1170,9 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) current_source_line = line; first_line_listed = line; -#ifdef UI_OUT /* If printing of source lines is disabled, just print file and line number */ if (ui_out_test_flags (uiout, ui_source_list)) { -#endif /* Only prints "No such file or directory" once */ if ((s != last_source_visited) || (!last_source_error)) { @@ -1002,14 +1184,12 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) desc = last_source_error; noerror = 1; } -#ifdef UI_OUT } else { desc = -1; noerror = 1; } -#endif if (desc < 0) { @@ -1022,14 +1202,10 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) print_sys_errmsg (name, errno); } else -#ifdef UI_OUT ui_out_field_int (uiout, "line", line); ui_out_text (uiout, "\tin "); ui_out_field_string (uiout, "file", s->filename); ui_out_text (uiout, "\n"); -#else - printf_filtered ("%d\tin %s\n", line, s->filename); -#endif return; } @@ -1057,7 +1233,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) while (nlines-- > 0) { -#ifdef UI_OUT char buf[20]; c = fgetc (stream); @@ -1075,7 +1250,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) } else if (c == 0177) ui_out_text (uiout, "^?"); -#ifdef CRLF_SOURCE_FILES else if (c == '\r') { /* Skip a \r character, but only before a \n. */ @@ -1086,7 +1260,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) if (c1 != EOF) ungetc (c1, stream); } -#endif else { sprintf (buf, "%c", c); @@ -1094,29 +1267,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) } } while (c != '\n' && (c = fgetc (stream)) >= 0); -#else - c = fgetc (stream); - if (c == EOF) - break; - last_line_listed = current_source_line; - printf_filtered ("%d\t", current_source_line++); - do - { - if (c < 040 && c != '\t' && c != '\n' && c != '\r') - printf_filtered ("^%c", c + 0100); - else if (c == 0177) - printf_filtered ("^?"); -#ifdef CRLF_SOURCE_FILES - else if (c == '\r') - { - /* Just skip \r characters. */ - } -#endif - else - printf_filtered ("%c", c); - } - while (c != '\n' && (c = fgetc (stream)) >= 0); -#endif } fclose (stream); @@ -1130,224 +1280,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) void print_source_lines (struct symtab *s, int line, int stopline, int noerror) { -#if defined(TUI) - if (!tui_version || - m_winPtrIsNull (srcWin) || !srcWin->generic.isVisible) - print_source_lines_base (s, line, stopline, noerror); - else - { - TuiGenWinInfoPtr locator = locatorWinInfoPtr (); -extern void tui_vAddWinToLayout (va_list); -extern void tui_vUpdateSourceWindowsWithLine (va_list); - - /* Regardless of whether we can open the file, - set current_source_symtab. */ - current_source_symtab = s; - current_source_line = line; - first_line_listed = line; - - /* make sure that the source window is displayed */ - tuiDo ((TuiOpaqueFuncPtr) tui_vAddWinToLayout, SRC_WIN); - - tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateSourceWindowsWithLine, s, line); - tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateLocatorFilename, s->filename); - } -#else print_source_lines_base (s, line, stopline, noerror); -#endif -} - - - -/* 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 (struct symtabs_and_lines *sals) -{ - int i; - - for (i = 0; i < sals->nelts; ++i) - printf_filtered ("file: \"%s\", line number: %d\n", - sals->sals[i].symtab->filename, sals->sals[i].line); -} - -static void -list_command (char *arg, int from_tty) -{ - struct symtabs_and_lines sals, sals_end; - struct symtab_and_line sal, sal_end; - struct symbol *sym; - char *arg1; - int no_end = 1; - int dummy_end = 0; - int dummy_beg = 0; - int linenum_beg = 0; - char *p; - - 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 && - (arg == 0 || arg[0] == '+' || arg[0] == '-')) - select_source_symtab (0); - - /* "l" or "l +" lists next ten lines. */ - - 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 + lines_to_list, 0); - return; - } - - /* "l -" lists previous ten lines, the ones before the ten just listed. */ - 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 - lines_to_list, 1), - first_line_listed, 0); - return; - } - - /* Now if there is only one argument, decode it in SAL - and set NO_END. - If there are two arguments, decode them in SAL and SAL_END - and clear NO_END; however, if one of the arguments is blank, - set DUMMY_BEG or DUMMY_END to record that fact. */ - - arg1 = arg; - if (*arg1 == ',') - dummy_beg = 1; - else - { - sals = decode_line_1 (&arg1, 0, 0, 0, 0); - - if (!sals.nelts) - return; /* C++ */ - if (sals.nelts > 1) - { - ambiguous_line_spec (&sals); - xfree (sals.sals); - return; - } - - sal = sals.sals[0]; - xfree (sals.sals); - } - - /* Record whether the BEG arg is all digits. */ - - for (p = arg; p != arg1 && *p >= '0' && *p <= '9'; p++); - linenum_beg = (p == arg1); - - while (*arg1 == ' ' || *arg1 == '\t') - arg1++; - if (*arg1 == ',') - { - no_end = 0; - arg1++; - while (*arg1 == ' ' || *arg1 == '\t') - arg1++; - if (*arg1 == 0) - dummy_end = 1; - else - { - if (dummy_beg) - sals_end = decode_line_1 (&arg1, 0, 0, 0, 0); - else - sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0); - if (sals_end.nelts == 0) - return; - if (sals_end.nelts > 1) - { - ambiguous_line_spec (&sals_end); - xfree (sals_end.sals); - return; - } - sal_end = sals_end.sals[0]; - xfree (sals_end.sals); - } - } - - if (*arg1) - error ("Junk at end of line specification."); - - if (!no_end && !dummy_beg && !dummy_end - && sal.symtab != sal_end.symtab) - error ("Specified start and end are in different files."); - if (dummy_beg && dummy_end) - error ("Two empty args do not say what lines to list."); - - /* if line was specified by address, - first print exactly which line, and which file. - In this case, sal.symtab == 0 means address is outside - of all known source files, not that user failed to give a filename. */ - if (*arg == '*') - { - if (sal.symtab == 0) - /* 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) - { - 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 - { - 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, - and it does not imply a symtab, it must be an undebuggable symbol - which means no source code. */ - - if (!linenum_beg && sal.symtab == 0) - error ("No line number known for %s.", arg); - - /* If this command is repeated with RET, - turn it into the no-arg variant. */ - - if (from_tty) - *arg = 0; - - 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 - (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) - { - int first_line = sal.line - lines_to_list / 2; - - if (first_line < 1) first_line = 1; - - print_source_lines (sal.symtab, first_line, first_line + lines_to_list, - 0); - } - else - print_source_lines (sal.symtab, sal.line, - (dummy_end - ? sal.line + lines_to_list - : sal_end.line + 1), - 0); } /* Print info on range of pc's in a specified line. */ @@ -1360,7 +1293,7 @@ line_info (char *arg, int from_tty) CORE_ADDR start_pc, end_pc; int i; - INIT_SAL (&sal); /* initialize to zeroes */ + init_sal (&sal); /* initialize to zeroes */ if (arg == 0) { @@ -1449,43 +1382,20 @@ line_info (char *arg, int from_tty) /* Commands to search the source file for a regexp. */ -/* ARGSUSED */ static void forward_search_command (char *regex, int from_tty) { - register int c; - register int desc; - register FILE *stream; + int c; + int desc; + FILE *stream; int line; char *msg; -#if defined(TUI) - /* - ** If this is the TUI, search from the first line displayed in - ** the source window, otherwise, search from last_line_listed+1 - ** in current_source_symtab - */ - if (!tui_version) - line = last_line_listed; - else - { - if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0) - line = ((TuiWinContent) - srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo; - else - { - printf_filtered ("No source displayed.\nExpression not found.\n"); - return; - } - } - line++; -#else line = last_line_listed + 1; -#endif msg = (char *) re_comp (regex); if (msg) - error (msg); + error ("%s", msg); if (current_source_symtab == 0) select_source_symtab (0); @@ -1514,7 +1424,7 @@ forward_search_command (char *regex, int from_tty) while (1) { static char *buf = NULL; - register char *p; + char *p; int cursize, newsize; cursize = 256; @@ -1537,7 +1447,6 @@ forward_search_command (char *regex, int from_tty) } while (c != '\n' && (c = getc (stream)) >= 0); -#ifdef CRLF_SOURCE_FILES /* Remove the \r, if any, at the end of the line, otherwise regular expressions that end with $ or \n won't work. */ if (p - buf > 1 && p[-2] == '\r') @@ -1545,7 +1454,6 @@ forward_search_command (char *regex, int from_tty) p--; p[-1] = '\n'; } -#endif /* we now have a source line in buf, null terminate and match */ *p = 0; @@ -1553,8 +1461,6 @@ forward_search_command (char *regex, int from_tty) { /* Match! */ fclose (stream); - if (tui_version) - print_source_lines_base (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, @@ -1569,42 +1475,20 @@ forward_search_command (char *regex, int from_tty) fclose (stream); } -/* ARGSUSED */ static void reverse_search_command (char *regex, int from_tty) { - register int c; - register int desc; - register FILE *stream; + int c; + int desc; + FILE *stream; int line; char *msg; -#if defined(TUI) - /* - ** If this is the TUI, search from the first line displayed in - ** the source window, otherwise, search from last_line_listed-1 - ** in current_source_symtab - */ - if (!tui_version) - line = last_line_listed; - else - { - if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0) - line = ((TuiWinContent) - srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo; - else - { - printf_filtered ("No source displayed.\nExpression not found.\n"); - return; - } - } - line--; -#else + line = last_line_listed - 1; -#endif msg = (char *) re_comp (regex); if (msg) - error (msg); + error ("%s", msg); if (current_source_symtab == 0) select_source_symtab (0); @@ -1634,7 +1518,7 @@ reverse_search_command (char *regex, int from_tty) { /* 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; + char *p = buf; c = getc (stream); if (c == EOF) @@ -1645,7 +1529,6 @@ reverse_search_command (char *regex, int from_tty) } while (c != '\n' && (c = getc (stream)) >= 0); -#ifdef CRLF_SOURCE_FILES /* Remove the \r, if any, at the end of the line, otherwise regular expressions that end with $ or \n won't work. */ if (p - buf > 1 && p[-2] == '\r') @@ -1653,7 +1536,6 @@ reverse_search_command (char *regex, int from_tty) p--; p[-1] = '\n'; } -#endif /* We now have a source line in buf; null terminate and match. */ *p = 0; @@ -1661,8 +1543,6 @@ reverse_search_command (char *regex, int from_tty) { /* Match! */ fclose (stream); - if (tui_version) - print_source_lines_base (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, @@ -1707,7 +1587,7 @@ With no argument, reset the search path to $cdir:$cwd, the default.", if (dbx_commands) add_com_alias ("use", "directory", class_files, 0); - c->completer = filename_completer; + set_cmd_completer (c, filename_completer); add_cmd ("directories", no_class, show_directories, "Current search path for finding source files.\n\ @@ -1756,30 +1636,7 @@ The matching line number is also stored as the value of \"$_\"."); add_com_alias ("?", "reverse-search", class_files, 0); } - add_com ("list", class_files, list_command, - 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.", NULL)); - - if (!xdb_commands) - add_com_alias ("l", "list", class_files, 1); - else - add_com_alias ("v", "list", class_files, 1); - - if (dbx_commands) - add_com_alias ("file", "list", class_files, 1); - - add_show_from_set + deprecated_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.",