#include "gdbcmd.h"
#include "frame.h"
-#ifdef USG
#include <sys/types.h>
-#endif
-
#include <string.h>
#include <sys/param.h>
#include <sys/stat.h>
#include "regex.h"
#include "symfile.h"
#include "objfiles.h"
+#include "annotate.h"
+
+#ifndef DIRNAME_SEPARATOR
+#define DIRNAME_SEPARATOR ':'
+#endif
/* Prototypes for local functions. */
static int first_line_listed;
\f
-/* Set the source file default for the "list" command, specifying a
- symtab. Sigh. Behavior specification: If it is called with a
- non-zero argument, that is the symtab to select. If it is not,
- first lookup "main"; if it exists, use the symtab and line it
- defines. If not, take the last symtab in the symtab lists (if it
- exists) or the last symtab in the psymtab lists (if *it* exists). If
- none of this works, report an error. */
+/* Set the source file default for the "list" command to be S.
+
+ If S is NULL, and we don't have a default, find one. This
+ should only be called when the user actually tries to use the
+ default, since we produce an error if we can't find a reasonable
+ default. Also, since this can cause symbols to be read, doing it
+ before we need to would make things slower than necessary. */
void
select_source_symtab (s)
return;
}
+ if (current_source_symtab)
+ return;
+
/* Make the default place to list be the function `main'
if one exists. */
if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL))
{
char *name = s -> filename;
int len = strlen (name);
- if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
{
current_source_symtab = s;
}
{
char *name = ps -> filename;
int len = strlen (name);
- if (! (len > 2 && (strcmp (&name[len - 2], ".h") == 0)))
+ if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
{
cs_pst = ps;
}
}
}
- if (current_source_symtab)
- return;
-
error ("Can't find a default source file");
}
\f
void
init_source_path ()
{
- source_path = savestring ("$cdir:$cwd", /* strlen of it */ 10);
+ char buf[20];
+
+ sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR);
+ source_path = strsave (buf);
forget_cached_source_info ();
}
struct stat st;
{
- char *colon = strchr (name, ':');
+ char *colon = strchr (name, DIRNAME_SEPARATOR);
char *space = strchr (name, ' ');
char *tab = strchr (name, '\t');
if (colon == 0 && space == 0 && tab == 0)
if (tab != 0 && (p == 0 || tab < p))
p = tab;
dirname = p + 1;
- while (*dirname == ':' || *dirname == ' ' || *dirname == '\t')
+ while (*dirname == DIRNAME_SEPARATOR || *dirname == ' ' || *dirname == '\t')
++dirname;
}
}
/* Unless it's a variable, check existence. */
if (name[0] != '$') {
+ /* These are warnings, not errors, since we don't want a
+ non-existent directory in a .gdbinit file to stop processing
+ of the .gdbinit file.
+
+ Whether they get added to the path is more debatable. Current
+ answer is yes, in case the user wants to go make the directory
+ or whatever. If the directory continues to not exist/not be
+ a directory/etc, then having them in the path should be
+ harmless. */
if (stat (name, &st) < 0)
- perror_with_name (name);
- if ((st.st_mode & S_IFMT) != S_IFDIR)
- error ("%s is not a directory.", name);
+ {
+ int save_errno = errno;
+ fprintf_unfiltered (gdb_stderr, "Warning: ");
+ print_sys_errmsg (name, save_errno);
+ }
+ else if ((st.st_mode & S_IFMT) != S_IFDIR)
+ warning ("%s is not a directory.", name);
}
append:
while (1)
{
if (!strncmp (p, name, len)
- && (p[len] == '\0' || p[len] == ':'))
+ && (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
{
/* Found it in the search path, remove old copy */
if (p > *which_path)
goto skip_dup; /* Same dir twice in one cmd */
strcpy (p, &p[len+1]); /* Copy from next \0 or : */
}
- p = strchr (p, ':');
+ p = strchr (p, DIRNAME_SEPARATOR);
if (p != 0)
++p;
else
}
if (p == 0)
{
+ char tinybuf[2];
+
+ tinybuf[0] = DIRNAME_SEPARATOR;
+ tinybuf[1] = '\0';
+
/* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */
if (prefix)
{
c = old[prefix];
old[prefix] = '\0';
- temp = concat (old, ":", name, NULL);
+ temp = concat (old, tinybuf, name, NULL);
old[prefix] = c;
*which_path = concat (temp, "", &old[prefix], NULL);
prefix = strlen (temp);
}
else
{
- *which_path = concat (name, (old[0]? ":" : old), old, NULL);
+ *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
prefix = strlen (name);
}
free (old);
\f
-/* Open a file named STRING, searching path PATH (dir names sep by colons)
+/* Open a file named STRING, searching path PATH (dir names sep by some char)
using mode MODE and protection bits PROT in the calls to open.
+
If TRY_CWD_FIRST, try to open ./STRING before searching PATH.
- (ie pretend the first element of PATH is ".")
+ (ie pretend the first element of PATH is "."). This also indicates
+ that a slash in STRING disables searching of the path (this is
+ so that "exec-file ./foo" or "symbol-file ./foo" insures that you
+ get that particular version of foo or an error message).
+
If FILENAMED_OPENED is non-null, set it to a newly allocated string naming
the actual file opened (this string will always start with a "/". We
have to take special pains to avoid doubling the "/" between the directory
if (!path)
path = ".";
- /* ./foo => foo */
- while (string[0] == '.' && string[1] == '/')
- string += 2;
-
if (try_cwd_first || string[0] == '/')
{
filename = string;
fd = open (filename, mode, prot);
- if (fd >= 0 || string[0] == '/')
+ if (fd >= 0 || string[0] == '/' || strchr (string, '/'))
goto done;
}
+ /* ./foo => foo */
+ while (string[0] == '.' && string[1] == '/')
+ string += 2;
+
alloclen = strlen (path) + strlen (string) + 2;
filename = (char *) alloca (alloclen);
fd = -1;
for (p = path; p; p = p1 ? p1 + 1 : 0)
{
- p1 = (char *) strchr (p, ':');
+ p1 = (char *) strchr (p, DIRNAME_SEPARATOR);
if (p1)
len = p1 - p;
else
strcat (filename+len, "/");
strcat (filename, string);
- fd = open (filename, mode, prot);
+ fd = open (filename, mode);
if (fd >= 0) break;
}
/* We cast strstr's result in case an ANSIhole has made it const,
which produces a "required warning" when assigned to a nonconst. */
p = (char *)strstr (source_path, "$cdir");
- if (p && (p == path || p[-1] == ':')
- && (p[cdir_len] == ':' || p[cdir_len] == '\0')) {
+ if (p && (p == path || p[-1] == DIRNAME_SEPARATOR)
+ && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0')) {
int len;
path = (char *)
/* Didn't work. Try using just the basename. */
p = basename (s->filename);
if (p != s->filename)
- result = openp(path, 0, p, O_RDONLY,0, &s->fullname);
+ result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
}
if (result >= 0)
{
- fullname = s -> fullname;
- s -> fullname = mstrsave (s -> objfile -> md, s -> fullname);
+ fullname = s->fullname;
+ s->fullname = mstrsave (s->objfile->md, s->fullname);
free (fullname);
}
return result;
Return 1 if successful, 0 if could not find the file. */
int
-identify_source_line (s, line, mid_statement)
+identify_source_line (s, line, mid_statement, pc)
struct symtab *s;
int line;
int mid_statement;
+ CORE_ADDR pc;
{
if (s->line_charpos == 0)
get_filename_and_charpos (s, (char **)NULL);
if (s->fullname == 0)
return 0;
- 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",
- get_frame_pc (get_current_frame()));
+ if (line > s->nlines)
+ /* Don't index off the end of the line_charpos array. */
+ return 0;
+ annotate_source (s->fullname, line, s->line_charpos[line - 1],
+ mid_statement, pc);
+
current_source_line = line;
first_line_listed = line;
last_line_listed = line;
perror_with_name (s->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (nlines-- > 0)
/* "l" or "l +" lists next ten lines. */
- if (arg == 0 || !strcmp (arg, "+"))
+ if (arg == 0 || STREQ (arg, "+"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
}
/* "l -" lists previous ten lines, the ones before the ten just listed. */
- if (!strcmp (arg, "-"))
+ if (STREQ (arg, "-"))
{
if (current_source_symtab == 0)
error ("No default source file yet. Do \"help list\".");
dummy_beg = 1;
else
{
- sals = decode_line_1 (&arg1, 0, 0, 0);
+ sals = decode_line_1 (&arg1, 0, 0, 0, 0);
if (! sals.nelts) return; /* C++ */
if (sals.nelts > 1)
else
{
if (dummy_beg)
- sals_end = decode_line_1 (&arg1, 0, 0, 0);
+ sals_end = decode_line_1 (&arg1, 0, 0, 0, 0);
else
- sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line);
+ sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0);
if (sals_end.nelts == 0)
return;
if (sals_end.nelts > 1)
if (*arg == '*')
{
if (sal.symtab == 0)
- error ("No source file for address %s.", local_hex_string(sal.pc));
+ /* FIXME-32x64--assumes sal.pc fits in long. */
+ error ("No source file for address %s.",
+ local_hex_string((unsigned long) sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
{
- printf_filtered ("%s is in ", local_hex_string(sal.pc));
- fprint_symbol (stdout, SYMBOL_NAME (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
- printf_filtered ("%s is at %s:%d.\n",
- local_hex_string(sal.pc),
- sal.symtab->filename, sal.line);
+ {
+ print_address_numeric (sal.pc, 1, gdb_stdout);
+ printf_filtered (" is at %s:%d.\n",
+ sal.symtab->filename, sal.line);
+ }
}
/* If line was not specified by just a line number,
{
sals = decode_line_spec_1 (arg, 0);
- /* If this command is repeated with RET,
- turn it into the no-arg variant. */
- if (from_tty)
- *arg = 0;
+ dont_repeat ();
}
/* C++ More than one line may have been specified, as when the user
sal = sals.sals[i];
if (sal.symtab == 0)
- error ("No source file specified.");
-
- if (sal.line > 0
- && find_line_pc_range (sal.symtab, sal.line, &start_pc, &end_pc))
+ {
+ printf_filtered ("No line number information available");
+ if (sal.pc != 0)
+ {
+ /* This is useful for "info line *0x7f34". If we can't tell the
+ user about a source line, at least let them have the symbolic
+ address. */
+ printf_filtered (" for address ");
+ wrap_here (" ");
+ print_address (sal.pc, gdb_stdout);
+ }
+ else
+ printf_filtered (".");
+ printf_filtered ("\n");
+ }
+ else if (sal.line > 0
+ && find_line_pc_range (sal, &start_pc, &end_pc))
{
if (start_pc == end_pc)
- printf_filtered ("Line %d of \"%s\" is at pc %s but contains no code.\n",
- sal.line, sal.symtab->filename, local_hex_string(start_pc));
+ {
+ printf_filtered ("Line %d of \"%s\"",
+ sal.line, sal.symtab->filename);
+ wrap_here (" ");
+ printf_filtered (" is at address ");
+ print_address (start_pc, gdb_stdout);
+ wrap_here (" ");
+ printf_filtered (" but contains no code.\n");
+ }
else
{
- printf_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));
+ 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
+ /* Is there any case in which we get here, and have an address
+ which the user would want to see? If we have debugging symbols
+ and no line numbers? */
printf_filtered ("Line number %d is out of range for \"%s\".\n",
sal.line, sal.symtab->filename);
}
+ free (sals.sals);
}
\f
/* Commands to search the source file for a regexp. */
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (1) {
/* FIXME!!! We walk right off the end of buf if we get a long line!!! */
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, "r");
+ stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
while (line > 1)
{
void
_initialize_source ()
{
+ struct cmd_list_element *c;
current_source_symtab = 0;
init_source_path ();
- add_com ("directory", class_files, directory_command,
+ /* The intention is to use POSIX Basic Regular Expressions.
+ Always use the GNU regex routine for consistency across all hosts.
+ Our current GNU regex.c does not have all the POSIX features, so this is
+ just an approximation. */
+ re_set_syntax (RE_SYNTAX_GREP);
+
+ c = add_cmd ("directory", class_files, directory_command,
"Add directory DIR to beginning of search path for source files.\n\
Forget cached info on source file locations and line positions.\n\
DIR can also be $cwd for the current working directory, or $cdir for the\n\
directory in which the source file was compiled into object code.\n\
-With no argument, reset the search path to $cdir:$cwd, the default.");
+With no argument, reset the search path to $cdir:$cwd, the default.",
+ &cmdlist);
+ c->completer = filename_completer;
add_cmd ("directories", no_class, show_directories,
"Current search path for finding source files.\n\