c3de2a19e8
Make it possible to build a cross gprof, although a few cases are still not handled: * configure.in: Don't set MY_TARGET. * gprof.h: Don't include MACHINE_H. Don't define FOPEN_RB or FOPEN_WB; just get them from sysdep.h. * core.h (min_insn_size, offset_to_code): Declare. * core.c (MIN_INSN_SIZE): Don't define. (min_insn_size, offset_to_code): New variables. (core_init): Initialize min_insn_size and offset_to_code. (find_call): New function. (core_create_line_syms): Don't use min_dist. Set is_static in pass 2. * hist.c (UNITS_TO_CODE): Define. * gprof.c (default_excluded_list): Add "__mcount_internal". * gmon.h: Change TARGET_alpha to __alpha__. * hertz.h: Ifdef MACH, define hertz as HZ. * alpha.c (alpha_Instruction): Rename from Instruction. Change all references. (alpha_find_call): Rename from find_call. * alpha.h: Remove. * dummy.c, dummy.h: Remove. * i386.c (i386_iscall): Rename from iscall. Change all references. Check for call instruction, not jump or lcall. (i386_find_call): Rename from find_call. Correct for VMA. Correct call destination computation. Don't dereference symbol if it is NULL. * i386.h: Remove. * ns532.c, ns532.h: Remove. * sparc.c (CALL): Define. (sparc_find_call): Rename from find_call. * sparc.h: Remove. * tahoe.c: Include cg_arcs.h, core.h, hist.h, and symtab.h. Don't include time_host.h. (CALLF, PC): Define. (enum tahoe_opermodes, tahoe_operandenum): Define. Rename all references to opermodes or operandenum to these. (tahoe_operandmode): Rename from operandmode. Call abort if switch does not return. (tahoe_operandname): Rename from operandname. Call abort if switch does not return. (tahoe_operandlength): Rename from operandlength. Call abort if switch does not return. (tahoe_reladdr): Rename from reladdr. (tahoe_find_call): Rename from find_call. Use core_text_space rather than textspace. * tahoe.h: Remove. * vax.c (CALLS, PC): Define. (enum opermodes, operandenum, struct modebyte): Define. (vax_operandmode): Rename from operandmode. Call abort if switch does not return. (vax_operandname): Rename from operandname. Call abort if switch does not return. (vax_operandlength): Rename from operandlength. Call abort if switch does not return. (vax_reladdr): Rename from reladdr. (vax_find_call): Rename from find_call. * vax.h: Remove. * Makefile.am (AUTOMAKE_OPTIONS): Set to cygnus. (MY_TARGET): Remove. (INCLUDES): Remove -DTARGET_$(MY_TARGET) and -DMACHINE_H= \"$(MY_TARGET).h\". (gprof_SOURCES): Add i386.c, alpha.c, vax.c, tahoe.c, sparc.c. (gprof_DEPENDENCIES): Remove $(MY_TARGET).o. (gprof_LDADD): Likewise. (noinst_HEADERS): Remove alpha.h, i386.h, ns532.h, sparc.h, tahoe.h, vax.h, dummy.h. (EXTRA_DIST): Remove alpha.c, i386.c, ns532.c, sparc.c, tahoe.c, vax.c, dummy.c. ($(OBJECTS)): Don't depend upon $(MY_TARGET).h. ($(MY_TARGET).o): Remove target. (i386.o, alpha.o, vax.o, tahoe.o, sparc.o): New targets. * configure, Makefile.in, aclocal.m4: Rebuild.
736 lines
19 KiB
C
736 lines
19 KiB
C
#include "libiberty.h"
|
|
#include "gprof.h"
|
|
#include "core.h"
|
|
#include "symtab.h"
|
|
|
|
bfd *core_bfd;
|
|
int core_num_syms;
|
|
asymbol **core_syms;
|
|
asection *core_text_sect;
|
|
PTR core_text_space;
|
|
|
|
int min_insn_size;
|
|
int offset_to_code;
|
|
|
|
/* For mapping symbols to specific .o files during file ordering. */
|
|
struct function_map {
|
|
char *function_name;
|
|
char *file_name;
|
|
};
|
|
|
|
struct function_map *symbol_map;
|
|
int symbol_map_count;
|
|
|
|
extern void i386_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
|
|
extern void alpha_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
|
|
extern void vax_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
|
|
extern void tahoe_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
|
|
extern void sparc_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
|
|
|
|
static void
|
|
DEFUN (read_function_mappings, (filename), const char *filename)
|
|
{
|
|
FILE *file = fopen (filename, "r");
|
|
char dummy[1024];
|
|
int count = 0;
|
|
|
|
if (!file)
|
|
{
|
|
fprintf (stderr, "%s: could not open %s.\n", whoami, filename);
|
|
done (1);
|
|
}
|
|
|
|
/* First parse the mapping file so we know how big we need to
|
|
make our tables. We also do some sanity checks at this
|
|
time. */
|
|
while (!feof (file))
|
|
{
|
|
int matches;
|
|
|
|
matches = fscanf (file, "%[^\n:]", dummy);
|
|
if (!matches)
|
|
{
|
|
fprintf (stderr, "%s: unable to parse mapping file %s.\n",
|
|
whoami, filename);
|
|
done (1);
|
|
}
|
|
|
|
/* Just skip messages about files with no symbols. */
|
|
if (!strncmp (dummy, "No symbols in ", 14))
|
|
{
|
|
fscanf (file, "\n");
|
|
continue;
|
|
}
|
|
|
|
/* Don't care what else is on this line at this point. */
|
|
fscanf (file, "%[^\n]\n", dummy);
|
|
count++;
|
|
}
|
|
|
|
/* Now we know how big we need to make our table. */
|
|
symbol_map = ((struct function_map *)
|
|
xmalloc (count * sizeof (struct function_map)));
|
|
|
|
/* Rewind the input file so we can read it again. */
|
|
rewind (file);
|
|
|
|
/* Read each entry and put it into the table. */
|
|
count = 0;
|
|
while (!feof (file))
|
|
{
|
|
int matches;
|
|
char *tmp;
|
|
|
|
matches = fscanf (file, "%[^\n:]", dummy);
|
|
if (!matches)
|
|
{
|
|
fprintf (stderr, "%s: unable to parse mapping file %s.\n",
|
|
whoami, filename);
|
|
done (1);
|
|
}
|
|
|
|
/* Just skip messages about files with no symbols. */
|
|
if (!strncmp (dummy, "No symbols in ", 14))
|
|
{
|
|
fscanf (file, "\n");
|
|
continue;
|
|
}
|
|
|
|
/* dummy has the filename, go ahead and copy it. */
|
|
symbol_map[count].file_name = xmalloc (strlen (dummy) + 1);
|
|
strcpy (symbol_map[count].file_name, dummy);
|
|
|
|
/* Now we need the function name. */
|
|
fscanf (file, "%[^\n]\n", dummy);
|
|
tmp = strrchr (dummy, ' ') + 1;
|
|
symbol_map[count].function_name = xmalloc (strlen (tmp) + 1);
|
|
strcpy (symbol_map[count].function_name, tmp);
|
|
count++;
|
|
}
|
|
|
|
/* Record the size of the map table for future reference. */
|
|
symbol_map_count = count;
|
|
}
|
|
|
|
void
|
|
DEFUN (core_init, (a_out_name), const char *a_out_name)
|
|
{
|
|
core_bfd = bfd_openr (a_out_name, 0);
|
|
|
|
if (!core_bfd)
|
|
{
|
|
perror (a_out_name);
|
|
done (1);
|
|
}
|
|
|
|
if (!bfd_check_format (core_bfd, bfd_object))
|
|
{
|
|
fprintf (stderr, "%s: %s: not in a.out format\n", whoami, a_out_name);
|
|
done (1);
|
|
}
|
|
|
|
/* get core's text section: */
|
|
core_text_sect = bfd_get_section_by_name (core_bfd, ".text");
|
|
if (!core_text_sect)
|
|
{
|
|
core_text_sect = bfd_get_section_by_name (core_bfd, "$CODE$");
|
|
if (!core_text_sect)
|
|
{
|
|
fprintf (stderr, "%s: can't find .text section in %s\n",
|
|
whoami, a_out_name);
|
|
done (1);
|
|
}
|
|
}
|
|
|
|
/* read core's symbol table: */
|
|
|
|
/* this will probably give us more than we need, but that's ok: */
|
|
core_num_syms = bfd_get_symtab_upper_bound (core_bfd);
|
|
if (core_num_syms < 0)
|
|
{
|
|
fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
done (1);
|
|
}
|
|
|
|
core_syms = (asymbol **) xmalloc (core_num_syms);
|
|
core_num_syms = bfd_canonicalize_symtab (core_bfd, core_syms);
|
|
if (core_num_syms < 0)
|
|
{
|
|
fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
done (1);
|
|
}
|
|
|
|
min_insn_size = 1;
|
|
offset_to_code = 0;
|
|
|
|
switch (bfd_get_arch (core_bfd))
|
|
{
|
|
case bfd_arch_vax:
|
|
case bfd_arch_tahoe:
|
|
offset_to_code = 2;
|
|
break;
|
|
|
|
case bfd_arch_alpha:
|
|
min_insn_size = 4;
|
|
break;
|
|
|
|
default:
|
|
}
|
|
|
|
if (function_mapping_file)
|
|
read_function_mappings (function_mapping_file);
|
|
}
|
|
|
|
|
|
/*
|
|
* Read in the text space of an a.out file
|
|
*/
|
|
void
|
|
DEFUN (core_get_text_space, (core_bfd), bfd * core_bfd)
|
|
{
|
|
core_text_space = (PTR) malloc (core_text_sect->_raw_size);
|
|
|
|
if (!core_text_space)
|
|
{
|
|
fprintf (stderr, "%s: ran out room for %ld bytes of text space\n",
|
|
whoami, core_text_sect->_raw_size);
|
|
done (1);
|
|
}
|
|
if (!bfd_get_section_contents (core_bfd, core_text_sect, core_text_space,
|
|
0, core_text_sect->_raw_size))
|
|
{
|
|
bfd_perror ("bfd_get_section_contents");
|
|
free (core_text_space);
|
|
core_text_space = 0;
|
|
}
|
|
if (!core_text_space)
|
|
{
|
|
fprintf (stderr, "%s: can't do -c\n", whoami);
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
DEFUN (find_call, (parent, p_lowpc, p_highpc),
|
|
Sym * parent AND bfd_vma p_lowpc AND bfd_vma p_highpc)
|
|
{
|
|
switch (bfd_get_arch (core_bfd))
|
|
{
|
|
case bfd_arch_i386:
|
|
i386_find_call (parent, p_lowpc, p_highpc);
|
|
break;
|
|
|
|
case bfd_arch_alpha:
|
|
alpha_find_call (parent, p_lowpc, p_highpc);
|
|
break;
|
|
|
|
case bfd_arch_vax:
|
|
vax_find_call (parent, p_lowpc, p_highpc);
|
|
break;
|
|
|
|
case bfd_arch_sparc:
|
|
sparc_find_call (parent, p_lowpc, p_highpc);
|
|
break;
|
|
|
|
case bfd_arch_tahoe:
|
|
tahoe_find_call (parent, p_lowpc, p_highpc);
|
|
break;
|
|
|
|
default:
|
|
fprintf (stderr, "%s: -c not supported on architecture %s\n",
|
|
whoami, bfd_printable_name(core_bfd));
|
|
|
|
/* Don't give the error more than once. */
|
|
ignore_direct_calls = FALSE;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Return class of symbol SYM. The returned class can be any of:
|
|
* 0 -> symbol is not interesting to us
|
|
* 'T' -> symbol is a global name
|
|
* 't' -> symbol is a local (static) name
|
|
*/
|
|
static int
|
|
DEFUN (core_sym_class, (sym), asymbol * sym)
|
|
{
|
|
symbol_info syminfo;
|
|
const char *name;
|
|
char sym_prefix;
|
|
int i;
|
|
|
|
if (sym->section == NULL || (sym->flags & BSF_DEBUGGING) != 0)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Must be a text symbol, and static text symbols don't qualify if
|
|
* ignore_static_funcs set.
|
|
*/
|
|
if (ignore_static_funcs && (sym->flags & BSF_LOCAL))
|
|
{
|
|
DBG (AOUTDEBUG, printf ("[core_sym_class] %s: not a function\n",
|
|
sym->name));
|
|
return 0;
|
|
}
|
|
|
|
bfd_get_symbol_info (core_bfd, sym, &syminfo);
|
|
i = syminfo.type;
|
|
|
|
if (i == 'T')
|
|
{
|
|
return i; /* it's a global symbol */
|
|
}
|
|
|
|
if (i == 'W')
|
|
{
|
|
/* Treat weak symbols as text symbols. FIXME: a weak symbol may
|
|
also be a data symbol. */
|
|
return 'T';
|
|
}
|
|
|
|
if (i != 't')
|
|
{
|
|
/* not a static text symbol */
|
|
DBG (AOUTDEBUG, printf ("[core_sym_class] %s is of class %c\n",
|
|
sym->name, i));
|
|
return 0;
|
|
}
|
|
|
|
/* do some more filtering on static function-names: */
|
|
|
|
if (ignore_static_funcs)
|
|
{
|
|
return 0;
|
|
}
|
|
/*
|
|
* Can't zero-length name or funny characters in name, where
|
|
* `funny' includes: `.' (.o file names) and `$' (Pascal labels).
|
|
*/
|
|
if (!sym->name || sym->name[0] == '\0')
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
for (name = sym->name; *name; ++name)
|
|
{
|
|
if (*name == '.' || *name == '$')
|
|
{
|
|
return 0;
|
|
}
|
|
}
|
|
/*
|
|
* On systems where the C compiler adds an underscore to all
|
|
* names, static names without underscores seem usually to be
|
|
* labels in hand written assembler in the library. We don't want
|
|
* these names. This is certainly necessary on a Sparc running
|
|
* SunOS 4.1 (try profiling a program that does a lot of
|
|
* division). I don't know whether it has harmful side effects on
|
|
* other systems. Perhaps it should be made configurable.
|
|
*/
|
|
sym_prefix = bfd_get_symbol_leading_char (core_bfd);
|
|
if ((sym_prefix && sym_prefix != sym->name[0])
|
|
/*
|
|
* GCC may add special symbols to help gdb figure out the file
|
|
* language. We want to ignore these, since sometimes they mask
|
|
* the real function. (dj@ctron)
|
|
*/
|
|
|| !strncmp (sym->name, "__gnu_compiled", 14)
|
|
|| !strncmp (sym->name, "___gnu_compiled", 15))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* If the object file supports marking of function symbols, then we can
|
|
zap anything that doesn't have BSF_FUNCTION set. */
|
|
if (ignore_non_functions && (sym->flags & BSF_FUNCTION) == 0)
|
|
return 0;
|
|
|
|
return 't'; /* it's a static text symbol */
|
|
}
|
|
|
|
|
|
/*
|
|
* Get whatever source info we can get regarding address ADDR:
|
|
*/
|
|
static bool
|
|
DEFUN (get_src_info, (addr, filename, name, line_num),
|
|
bfd_vma addr AND const char **filename AND const char **name
|
|
AND int *line_num)
|
|
{
|
|
const char *fname = 0, *func_name = 0;
|
|
int l = 0;
|
|
|
|
if (bfd_find_nearest_line (core_bfd, core_text_sect, core_syms,
|
|
addr - core_text_sect->vma,
|
|
&fname, &func_name, (unsigned int *) &l)
|
|
&& fname && func_name && l)
|
|
{
|
|
DBG (AOUTDEBUG, printf ("[get_src_info] 0x%lx -> %s:%d (%s)\n",
|
|
addr, fname, l, func_name));
|
|
*filename = fname;
|
|
*name = func_name;
|
|
*line_num = l;
|
|
return TRUE;
|
|
}
|
|
else
|
|
{
|
|
DBG (AOUTDEBUG, printf ("[get_src_info] no info for 0x%lx (%s:%d,%s)\n",
|
|
(long) addr, fname ? fname : "<unknown>", l,
|
|
func_name ? func_name : "<unknown>"));
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* Read in symbol table from core. One symbol per function is
|
|
* entered.
|
|
*/
|
|
void
|
|
DEFUN (core_create_function_syms, (core_bfd), bfd * core_bfd)
|
|
{
|
|
bfd_vma min_vma = ~0, max_vma = 0;
|
|
int class;
|
|
long i, j, found, skip;
|
|
|
|
/* pass 1 - determine upper bound on number of function names: */
|
|
symtab.len = 0;
|
|
for (i = 0; i < core_num_syms; ++i)
|
|
{
|
|
if (!core_sym_class (core_syms[i]))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
/* This should be replaced with a binary search or hashed
|
|
search. Gross.
|
|
|
|
Don't create a symtab entry for a function that has
|
|
a mapping to a file, unless it's the first function
|
|
in the file. */
|
|
skip = 0;
|
|
for (j = 0; j < symbol_map_count; j++)
|
|
if (!strcmp (core_syms[i]->name, symbol_map[j].function_name))
|
|
{
|
|
if (j > 0 && ! strcmp (symbol_map [j].file_name,
|
|
symbol_map [j - 1].file_name))
|
|
skip = 1;
|
|
break;
|
|
}
|
|
if (!skip)
|
|
++symtab.len;
|
|
}
|
|
|
|
if (symtab.len == 0)
|
|
{
|
|
fprintf (stderr, "%s: file `%s' has no symbols\n", whoami, a_out_name);
|
|
done (1);
|
|
}
|
|
|
|
/* the "+ 2" is for the sentinels: */
|
|
symtab.base = (Sym *) xmalloc ((symtab.len + 2) * sizeof (Sym));
|
|
|
|
/* pass 2 - create symbols: */
|
|
|
|
symtab.limit = symtab.base;
|
|
for (i = 0; i < core_num_syms; ++i)
|
|
{
|
|
class = core_sym_class (core_syms[i]);
|
|
if (!class)
|
|
{
|
|
DBG (AOUTDEBUG,
|
|
printf ("[core_create_function_syms] rejecting: 0x%lx %s\n",
|
|
core_syms[i]->value, core_syms[i]->name));
|
|
continue;
|
|
}
|
|
/* This should be replaced with a binary search or hashed
|
|
search. Gross. */
|
|
|
|
skip = 0;
|
|
found = 0;
|
|
for (j = 0; j < symbol_map_count; j++)
|
|
if (!strcmp (core_syms[i]->name, symbol_map[j].function_name))
|
|
{
|
|
if (j > 0 && ! strcmp (symbol_map [j].file_name,
|
|
symbol_map [j - 1].file_name))
|
|
skip = 1;
|
|
else
|
|
found = j;
|
|
break;
|
|
}
|
|
|
|
if (skip)
|
|
continue;
|
|
|
|
sym_init (symtab.limit);
|
|
|
|
/* symbol offsets are always section-relative: */
|
|
|
|
symtab.limit->addr = core_syms[i]->value + core_syms[i]->section->vma;
|
|
if (symbol_map_count
|
|
&& !strcmp (core_syms[i]->name, symbol_map[found].function_name))
|
|
{
|
|
symtab.limit->name = symbol_map[found].file_name;
|
|
symtab.limit->mapped = 1;
|
|
}
|
|
else
|
|
{
|
|
symtab.limit->name = core_syms[i]->name;
|
|
symtab.limit->mapped = 0;
|
|
}
|
|
|
|
/* Lookup filename and line number, if we can */
|
|
|
|
{
|
|
const char *filename, *func_name;
|
|
|
|
if (get_src_info (symtab.limit->addr, &filename, &func_name,
|
|
&symtab.limit->line_num))
|
|
{
|
|
symtab.limit->file = source_file_lookup_path (filename);
|
|
|
|
/* FIXME: Checking __osf__ here does not work with a cross
|
|
gprof. */
|
|
#ifdef __osf__
|
|
/*
|
|
* Suppress symbols that are not function names. This is
|
|
* useful to suppress code-labels and aliases.
|
|
*
|
|
* This is known to be useful under DEC's OSF/1. Under SunOS 4.x,
|
|
* labels do not appear in the symbol table info, so this isn't
|
|
* necessary.
|
|
*/
|
|
|
|
if (strcmp (symtab.limit->name, func_name) != 0)
|
|
{
|
|
/*
|
|
* The symbol's address maps to a different name, so
|
|
* it can't be a function-entry point. This happens
|
|
* for labels, for example.
|
|
*/
|
|
DBG (AOUTDEBUG,
|
|
printf ("[core_create_function_syms: rej %s (maps to %s)\n",
|
|
symtab.limit->name, func_name));
|
|
continue;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
symtab.limit->is_func = TRUE;
|
|
symtab.limit->is_bb_head = TRUE;
|
|
if (class == 't')
|
|
{
|
|
symtab.limit->is_static = TRUE;
|
|
}
|
|
|
|
min_vma = MIN (symtab.limit->addr, min_vma);
|
|
max_vma = MAX (symtab.limit->addr, max_vma);
|
|
|
|
/*
|
|
* If we see "main" without an initial '_', we assume names
|
|
* are *not* prefixed by '_'.
|
|
*/
|
|
if (symtab.limit->name[0] == 'm' && discard_underscores
|
|
&& strcmp (symtab.limit->name, "main") == 0)
|
|
{
|
|
discard_underscores = 0;
|
|
}
|
|
|
|
DBG (AOUTDEBUG, printf ("[core_create_function_syms] %ld %s 0x%lx\n",
|
|
(long) (symtab.limit - symtab.base),
|
|
symtab.limit->name, symtab.limit->addr));
|
|
++symtab.limit;
|
|
}
|
|
|
|
/* create sentinels: */
|
|
|
|
sym_init (symtab.limit);
|
|
symtab.limit->name = "<locore>";
|
|
symtab.limit->addr = 0;
|
|
symtab.limit->end_addr = min_vma - 1;
|
|
++symtab.limit;
|
|
|
|
sym_init (symtab.limit);
|
|
symtab.limit->name = "<hicore>";
|
|
symtab.limit->addr = max_vma + 1;
|
|
symtab.limit->end_addr = ~0;
|
|
++symtab.limit;
|
|
|
|
symtab.len = symtab.limit - symtab.base;
|
|
symtab_finalize (&symtab);
|
|
}
|
|
|
|
|
|
/*
|
|
* Read in symbol table from core. One symbol per line of source code
|
|
* is entered.
|
|
*/
|
|
void
|
|
DEFUN (core_create_line_syms, (core_bfd), bfd * core_bfd)
|
|
{
|
|
char prev_name[PATH_MAX], prev_filename[PATH_MAX];
|
|
bfd_vma vma, min_vma = ~0, max_vma = 0;
|
|
bfd_vma offset;
|
|
Sym *prev, dummy, *sentinel, *sym;
|
|
const char *filename;
|
|
int prev_line_num;
|
|
Sym_Table ltab;
|
|
/*
|
|
* Create symbols for functions as usual. This is necessary in
|
|
* cases where parts of a program were not compiled with -g. For
|
|
* those parts we still want to get info at the function level:
|
|
*/
|
|
core_create_function_syms (core_bfd);
|
|
|
|
/* pass 1 - counter number of symbols: */
|
|
|
|
/*
|
|
* To find all line information, walk through all possible
|
|
* text-space addresses (one by one!) and get the debugging
|
|
* info for each address. When the debugging info changes,
|
|
* it is time to create a new symbol.
|
|
*
|
|
* Of course, this is rather slow and it would be better if
|
|
* bfd would provide an iterator for enumerating all line infos
|
|
*/
|
|
prev_name[0] = '\0';
|
|
ltab.len = 0;
|
|
prev_filename[0] = '\0';
|
|
prev_line_num = 0;
|
|
for (offset = 0; offset < core_text_sect->_raw_size; offset += min_insn_size)
|
|
{
|
|
vma = core_text_sect->vma + offset;
|
|
if (!get_src_info (vma, &filename, &dummy.name, &dummy.line_num)
|
|
|| (prev_line_num == dummy.line_num &&
|
|
strcmp (prev_name, dummy.name) == 0
|
|
&& strcmp (prev_filename, filename) == 0))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
++ltab.len;
|
|
prev_line_num = dummy.line_num;
|
|
strcpy (prev_name, dummy.name);
|
|
strcpy (prev_filename, filename);
|
|
|
|
min_vma = MIN (vma, min_vma);
|
|
max_vma = MAX (vma, max_vma);
|
|
}
|
|
|
|
/* make room for function symbols, too: */
|
|
ltab.len += symtab.len;
|
|
ltab.base = (Sym *) xmalloc (ltab.len * sizeof (Sym));
|
|
ltab.limit = ltab.base;
|
|
|
|
/* pass 2 - create symbols: */
|
|
|
|
/* We now set is_static as we go along, rather than by running
|
|
through the symbol table at the end.
|
|
|
|
The old way called symtab_finalize before the is_static pass,
|
|
causing a problem since symtab_finalize uses is_static as part of
|
|
its address conflict resolution algorithm. Since global symbols
|
|
were prefered over static symbols, and all line symbols were
|
|
global at that point, static function names that conflicted with
|
|
their own line numbers (static, but labeled as global) were
|
|
rejected in favor of the line num.
|
|
|
|
This was not the desired functionality. We always want to keep
|
|
our function symbols and discard any conflicting line symbols.
|
|
Perhaps symtab_finalize should be modified to make this
|
|
distinction as well, but the current fix works and the code is a
|
|
lot cleaner now. */
|
|
|
|
prev = 0;
|
|
for (offset = 0; offset < core_text_sect->_raw_size; offset += min_insn_size)
|
|
{
|
|
sym_init (ltab.limit);
|
|
if (!get_src_info (core_text_sect->vma + offset, &filename,
|
|
<ab.limit->name, <ab.limit->line_num)
|
|
|| (prev && prev->line_num == ltab.limit->line_num
|
|
&& strcmp (prev->name, ltab.limit->name) == 0
|
|
&& strcmp (prev->file->name, filename) == 0))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
/* make name pointer a malloc'ed string: */
|
|
ltab.limit->name = xstrdup (ltab.limit->name);
|
|
ltab.limit->file = source_file_lookup_path (filename);
|
|
|
|
ltab.limit->addr = core_text_sect->vma + offset;
|
|
|
|
/* Set is_static based on the enclosing function, using either:
|
|
* 1) the previous symbol, if it's from the same function, or
|
|
* 2) a symtab lookup
|
|
*/
|
|
|
|
if (prev && ltab.limit->file == prev->file &&
|
|
strcmp (ltab.limit->name, prev->name) == 0)
|
|
{
|
|
ltab.limit->is_static = prev->is_static;
|
|
}
|
|
else
|
|
{
|
|
sym = sym_lookup(&symtab, ltab.limit->addr);
|
|
ltab.limit->is_static = sym->is_static;
|
|
}
|
|
|
|
prev = ltab.limit;
|
|
|
|
/*
|
|
* If we see "main" without an initial '_', we assume names
|
|
* are *not* prefixed by '_'.
|
|
*/
|
|
if (ltab.limit->name[0] == 'm' && discard_underscores
|
|
&& strcmp (ltab.limit->name, "main") == 0)
|
|
{
|
|
discard_underscores = 0;
|
|
}
|
|
|
|
DBG (AOUTDEBUG, printf ("[core_create_line_syms] %d %s 0x%lx\n",
|
|
ltab.limit - ltab.base, ltab.limit->name,
|
|
ltab.limit->addr));
|
|
++ltab.limit;
|
|
}
|
|
|
|
/* update sentinels: */
|
|
|
|
sentinel = sym_lookup (&symtab, 0);
|
|
if (strcmp (sentinel->name, "<locore>") == 0
|
|
&& min_vma <= sentinel->end_addr)
|
|
{
|
|
sentinel->end_addr = min_vma - 1;
|
|
}
|
|
|
|
sentinel = sym_lookup (&symtab, ~0);
|
|
if (strcmp (sentinel->name, "<hicore>") == 0 && max_vma >= sentinel->addr)
|
|
{
|
|
sentinel->addr = max_vma + 1;
|
|
}
|
|
|
|
/* copy in function symbols: */
|
|
memcpy (ltab.limit, symtab.base, symtab.len * sizeof (Sym));
|
|
ltab.limit += symtab.len;
|
|
|
|
if (ltab.limit - ltab.base != ltab.len)
|
|
{
|
|
fprintf (stderr,
|
|
"%s: somebody miscounted: ltab.len=%d instead of %ld\n",
|
|
whoami, ltab.len, (long) (ltab.limit - ltab.base));
|
|
done (1);
|
|
}
|
|
|
|
/* finalize ltab and make it symbol table: */
|
|
|
|
symtab_finalize (<ab);
|
|
free (symtab.base);
|
|
symtab = ltab;
|
|
|
|
}
|