#else /* No BFD64 */
-/* Default to support for "long long" if the host compiler being used is gcc.
- Config files must define CC_HAS_LONG_LONG to use other host compilers
- that are capable of supporting "long long", and to cause gdb to use that
- support. Not defining CC_HAS_LONG_LONG will suppress use of "long long"
- regardless of what compiler is used.
-
- FIXME: For now, automatic selection of "long long" as the default when
- gcc is used is disabled, pending further testing. Concerns include the
- impact on gdb performance and the universality of bugfree long long
- support on platforms that do have gcc. Compiling with FORCE_LONG_LONG
- will select "long long" use for testing purposes. -fnf */
+/* If all compilers for this host support "long long" and we want to
+ use it for LONGEST (the performance hit is about 10% on a testsuite
+ run based on one DECstation test), then the xm.h file can define
+ CC_HAS_LONG_LONG.
+
+ Using GCC 1.39 on BSDI with long long causes about 700 new
+ testsuite failures. Using long long for LONGEST on the DECstation
+ causes 3 new FAILs in the testsuite and many heuristic fencepost
+ warnings. These are not investigated, but a first guess would be
+ that the BSDI problems are GCC bugs in long long support and the
+ latter are GDB bugs. */
#ifndef CC_HAS_LONG_LONG
-# if defined (__GNUC__) /*&& defined (FORCE_LONG_LONG)*/ /* See FIXME above */
+# if defined (__GNUC__) && defined (FORCE_LONG_LONG)
# define CC_HAS_LONG_LONG 1
# endif
#endif
-
+
/* LONGEST should not be a typedef, because "unsigned LONGEST" needs to work.
CC_HAS_LONG_LONG is defined if the host compiler supports "long long"
variables and we wish to make use of that support. */
extern void
qsort PARAMS ((void *base, size_t nmemb, /* 4.10.5.2 */
size_t size,
- int (*comp)(const void *, const void *)));
+ int (*compar)(const void *, const void *)));
#ifndef MEM_FNS_DECLARED /* Some non-ANSI use void *, not char *. */
extern PTR
#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 "symfile.h"
#include "objfiles.h"
+#ifndef DIRNAME_SEPARATOR
+#define DIRNAME_SEPARATOR ':'
+#endif
+
/* Prototypes for local functions. */
static int
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;
}
}
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.
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;
if (line > s->nlines)
/* Don't index off the end of the line_charpos array. */
return 0;
+ /* FIXME-32x64: Need a version of print_address_numeric which does
+ not pass use_local to print_longest. */
printf_unfiltered ("\032\032%s:%d:%d:%s:0x%lx\n", s->fullname,
line, s->line_charpos[line - 1],
mid_statement ? "middle" : "beg",
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)
{
- printf_filtered ("%s is in ",
- local_hex_string((unsigned long) sal.pc));
+ print_address_numeric (sal.pc, 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((unsigned long) sal.pc),
- sal.symtab->filename, sal.line);
+ {
+ print_address_numeric (sal.pc, gdb_stdout);
+ printf_filtered (" is at %s:%d.\n",
+ sal.symtab->filename, sal.line);
+ }
}
/* If line was not specified by just a line number,
printf_filtered ("\n");
}
else if (sal.line > 0
- && find_line_pc_range (sal.symtab, sal.line, &start_pc, &end_pc))
+ && find_line_pc_range (sal, &start_pc, &end_pc))
{
if (start_pc == end_pc)
{
projects / binutils-gdb.git / commitdiff