along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
#include "defs.h"
#include "symtab.h"
-#include "param.h"
+#include "expression.h"
#include "language.h"
#include "command.h"
#include "gdbcmd.h"
#include <fcntl.h>
#include "gdbcore.h"
#include "regex.h"
+#include "symfile.h"
+#include "objfiles.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 ((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(); */
-extern void set_next_address ();
-
/* Path of directories to search for source files.
Same format as the PATH environment variable's value. */
and friends should be rewritten to count characters and see where
things are wrapping, but that would be a fair amount of work. */
-unsigned lines_to_list = 10;
+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. */
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 psymtab_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 symtab_and_line sal;
struct partial_symtab *ps;
struct partial_symtab *cs_pst = 0;
+ struct objfile *ofp;
if (s)
{
current_source_line = 1;
- for (s = symtab_list; s; s = s->next)
+ for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
{
- char *name = s->filename;
- int len = strlen (name);
- if (! (len > 2 && !strcmp (&name[len - 2], ".h")))
- current_source_symtab = s;
+ for (s = ofp -> symtabs; s; s = s->next)
+ {
+ char *name = s -> filename;
+ int len = strlen (name);
+ if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
+ {
+ current_source_symtab = s;
+ }
+ }
}
if (current_source_symtab)
return;
- /* Howabout the partial symtab list? */
+ /* Howabout the partial symbol tables? */
- if (partial_symtab_list)
+ 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
+ }
+ else
+ {
current_source_symtab = PSYMTAB_TO_SYMTAB (cs_pst);
+ }
}
+
if (current_source_symtab)
return;
}
\f
static void
-show_directories ()
+show_directories (ignore, from_tty)
+ char *ignore;
+ int from_tty;
{
- printf ("Source directories searched: %s\n", source_path);
+ puts_filtered ("Source directories searched: ");
+ puts_filtered (source_path);
+ puts_filtered ("\n");
}
/* Forget what we learned about line positions in source files,
forget_cached_source_info ()
{
register struct symtab *s;
+ register struct objfile *objfile;
- for (s = symtab_list; s; s = s->next)
+ for (objfile = object_files; objfile != NULL; objfile = objfile -> next)
{
- if (s->line_charpos != 0)
+ for (s = objfile -> symtabs; s != NULL; s = s -> next)
{
- free (s->line_charpos);
- s->line_charpos = 0;
- }
- if (s->fullname != 0)
- {
- free (s->fullname);
- s->fullname = 0;
+ 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;
+ }
}
}
}
else
mod_path (dirname, &source_path);
if (from_tty)
- show_directories ();
+ show_directories ((char *)0, from_tty);
forget_cached_source_info ();
}
do
{
- extern char *index ();
char *name = dirname;
register char *p;
struct stat st;
{
- char *colon = index (name, ':');
- char *space = index (name, ' ');
- char *tab = index (name, '\t');
+ 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
if (name[0] == '~')
name = tilde_expand (name);
else if (name[0] != '/' && name[0] != '$')
- name = concat (current_directory, "/", name);
+ name = concat (current_directory, "/", name, NULL);
else
name = savestring (name, p - name);
make_cleanup (free, name);
goto skip_dup; /* Same dir twice in one cmd */
strcpy (p, &p[len+1]); /* Copy from next \0 or : */
}
- p = index (p, ':');
+ p = strchr (p, ':');
if (p != 0)
++p;
else
c = old[prefix];
old[prefix] = '\0';
- temp = concat (old, ":", name);
+ temp = concat (old, ":", name, NULL);
old[prefix] = c;
- *which_path = concat (temp, "", &old[prefix]);
+ *which_path = concat (temp, "", &old[prefix], NULL);
prefix = strlen (temp);
free (temp);
}
else
{
- *which_path = concat (name, (old[0]? ":" : old), old);
+ *which_path = concat (name, (old[0]? ":" : old), old, NULL);
prefix = strlen (name);
}
free (old);
static void
-source_info ()
+source_info (ignore, from_tty)
+ char *ignore;
+ int from_tty;
{
register struct symtab *s = current_source_symtab;
if (!s)
{
- printf("No current source file.\n");
+ printf_filtered("No current source file.\n");
return;
}
- printf ("Current source file is %s\n", s->filename);
+ printf_filtered ("Current source file is %s\n", s->filename);
if (s->dirname)
- printf ("Compilation directory is %s\n", s->dirname);
+ printf_filtered ("Compilation directory is %s\n", s->dirname);
if (s->fullname)
- printf ("Located in %s\n", s->fullname);
+ printf_filtered ("Located in %s\n", s->fullname);
if (s->nlines)
- printf ("Contains %d lines\n", s->nlines);
+ printf_filtered ("Contains %d line%s.\n", s->nlines,
+ s->nlines == 1 ? "" : "s");
- printf("Source language %s.\n", language_str (s->language));
+ printf_filtered("Source language is %s.\n", language_str (s->language));
}
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
filename[len] = 0;
}
- /* Beware the // my son, the Emacs barfs, the botch that catch... */
- while (len > 1 && filename[len-1] == '/')
- filename[--len] = 0;
+ /* Remove trailing slashes */
+ while (len > 0 && filename[len-1] == '/')
+ filename[--len] = 0;
+
strcat (filename+len, "/");
strcat (filename, string);
*filename_opened = concat (current_directory,
'/' == current_directory[strlen(current_directory)-1]? "": "/",
- filename);
+ filename, NULL);
}
return fd;
/* Open a source file given a symtab S. Returns a file descriptor
or negative number for error. */
-int
+
+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)
if (result >= 0)
return result;
/* Didn't work -- free old one, try again. */
- free (s->fullname);
+ mfree (s->objfile->md, s->fullname);
s->fullname = NULL;
}
}
}
- return openp (path, 0, s->filename, O_RDONLY, 0, &s->fullname);
+ 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
register char *data, *p, *end;
int nlines = 0;
int lines_allocated = 1000;
- int *line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
+ int *line_charpos;
+ long exec_mtime;
+ int size;
+#ifdef LSEEK_NOT_LINEAR
+ char c;
+#endif
+ line_charpos = (int *) xmmalloc (s -> objfile -> md,
+ lines_allocated * sizeof (int));
if (fstat (desc, &st) < 0)
- perror_with_name (s->filename);
- if (exec_bfd && bfd_get_mtime(exec_bfd) < st.st_mtime)
- printf ("Source file is more recent than executable.\n");
+ perror_with_name (s->filename);
+
+ if (exec_bfd) {
+ exec_mtime = bfd_get_mtime(exec_bfd);
+ if (exec_mtime && exec_mtime < st.st_mtime)
+ printf_filtered ("Source file is more recent than executable.\n");
+ }
+
+#ifdef LSEEK_NOT_LINEAR
+ /* Have to read it byte by byte to find out where the chars live */
+
+ line_charpos[0] = tell(desc);
+ nlines = 1;
+ while (myread(desc, &c, 1)>0)
+ {
+ if (c == '\n')
+ {
+ if (nlines == lines_allocated)
+ {
+ lines_allocated *= 2;
+ line_charpos =
+ (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ sizeof (int) * lines_allocated);
+ }
+ line_charpos[nlines++] = tell(desc);
+ }
+ }
+
+#else
+ /* st_size might be a large type, but we only support source files whose
+ size fits in an int. FIXME. */
+ size = (int) st.st_size;
#ifdef BROKEN_LARGE_ALLOCA
- data = (char *) xmalloc (st.st_size);
+ data = (char *) xmalloc (size);
make_cleanup (free, data);
#else
- data = (char *) alloca (st.st_size);
+ data = (char *) alloca (size);
#endif
- if (myread (desc, data, st.st_size) < 0)
- perror_with_name (s->filename);
- end = data + st.st_size;
+ if (myread (desc, data, size) < 0)
+ perror_with_name (s->filename);
+ end = data + size;
p = data;
line_charpos[0] = 0;
nlines = 1;
while (p != end)
+ {
+ if (*p++ == '\n'
+ /* A newline at the end does not start a new line. */
+ && p != end)
{
- if (*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 (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;
}
+ }
+#endif
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
+static int
get_filename_and_charpos (s, fullname)
struct symtab *s;
char **fullname;
get_filename_and_charpos (s, (char **)NULL);
if (s->fullname == 0)
return 0;
+ if (line >= s->nlines)
+ return 0;
printf ("\032\032%s:%d:%d:%s:0x%x\n", s->fullname,
line, s->line_charpos[line - 1],
mid_statement ? "middle" : "beg",
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 ("^?");
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);
}
int linenum_beg = 0;
char *p;
- if (symtab_list == 0 && partial_symtab_list == 0)
+ 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 */
/* "l" or "l +" lists next ten lines. */
- if (arg == 0 || !strcmp (arg, "+"))
+ if (arg == 0 || STREQ (arg, "+"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
}
/* "l -" lists previous ten lines, the ones before the ten just listed. */
- if (!strcmp (arg, "-"))
+ if (STREQ (arg, "-"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
error ("No source file for address %s.", local_hex_string(sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
- printf ("%s is in %s (%s, line %d).\n",
- local_hex_string(sal.pc),
- SYMBOL_NAME (sym), sal.symtab->filename, sal.line);
+ {
+ printf_filtered ("%s is in ", local_hex_string(sal.pc));
+ fputs_filtered (SYMBOL_SOURCE_NAME (sym), stdout);
+ printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
+ }
else
- printf ("%s is in %s, line %d.\n",
- local_hex_string(sal.pc),
- sal.symtab->filename, sal.line);
+ printf_filtered ("%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,
&& 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 %s but contains no code.\n",
- sal.line, sal.symtab->filename, local_hex_string(start_pc));
+ printf_filtered ("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 %s",
- sal.line, sal.symtab->filename,
- local_hex_string(start_pc));
- printf (" and ends at %s.\n",
- local_hex_string(end_pc));
+ {
+ printf_filtered ("Line %d of \"%s\" starts at pc %s",
+ sal.line, sal.symtab->filename,
+ local_hex_string(start_pc));
+ printf_filtered (" 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. */
last_line_listed = sal.line + 1;
}
else
- printf ("Line number %d is out of range for \"%s\".\n",
- sal.line, sal.symtab->filename);
+ printf_filtered ("Line number %d is out of range for \"%s\".\n",
+ sal.line, sal.symtab->filename);
}
}
\f
line++;
}
- printf ("Expression not found\n");
+ printf_filtered ("Expression not found\n");
fclose (stream);
}
}
}
- printf ("Expression not found\n");
+ printf_filtered ("Expression not found\n");
fclose (stream);
return;
}
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_com_alias ("l", "list", class_files, 1);
add_show_from_set
(add_set_cmd ("listsize", class_support, var_uinteger,
projects / deliverable / binutils-gdb.git / blobdiff