#include "gprof.h"
#include "cg_arcs.h"
-#include "core.h"
+#include "corefile.h"
#include "symtab.h"
Sym_Table symtab;
sym->cg.prop.fract = 0.0;
sym->cg.prop.self = 0.0;
sym->cg.prop.child = 0.0;
-} /* sym_init */
+}
/*
else if (left->addr < right->addr)
{
return -1;
- } /* if */
+ }
if (left->is_func != right->is_func)
{
return right->is_func - left->is_func;
- } /* if */
+ }
return left->is_static - right->is_static;
-} /* cmp_addr */
+}
void
if (!tab->len)
{
return;
- } /* if */
+ }
/*
* Sort symbol table in order of increasing function addresses:
if (src->addr == prev_addr)
{
/*
- * If same address, favor global symbol over static one.
- * If both symbols are either static or global, check
+ * If same address, favor global symbol over static one,
+ * then function over line number. If both symbols are
+ * either static or global and either function or line, check
* whether one has name beginning with underscore while
* the other doesn't. In such cases, keep sym without
* underscore. This takes cares of compiler generated
* symbols (such as __gnu_compiled, __c89_used, etc.).
*/
if ((!src->is_static && dst[-1].is_static)
- || ((src->is_static == dst[-1].is_static) &&
- (src->name[0] != '_' && dst[-1].name[0] == '_')
- || (src->name[0]
- && src->name[1] != '_' && dst[-1].name[1] == '_')))
+ || ((src->is_static == dst[-1].is_static)
+ && ((src->is_func && !dst[-1].is_func)
+ || ((src->is_func == dst[-1].is_func)
+ && ((src->name[0] != '_' && dst[-1].name[0] == '_')
+ || (src->name[0]
+ && src->name[1] != '_'
+ && dst[-1].name[1] == '_'))))))
{
DBG (AOUTDEBUG | IDDEBUG,
printf ("[symtab_finalize] favor %s@%c%c over %s@%c%c",
src->is_func ? 'F' : 'f',
dst[-1].name, dst[-1].is_static ? 't' : 'T',
dst[-1].is_func ? 'F' : 'f');
- printf (" (addr=%lx)\n", src->addr));
+ printf (" (addr=%lx)\n", (unsigned long) src->addr));
dst[-1] = *src;
}
else
dst[-1].is_func ? 'F' : 'f',
src->name, src->is_static ? 't' : 'T',
src->is_func ? 'F' : 'f');
- printf (" (addr=%lx)\n", src->addr));
- } /* if */
+ printf (" (addr=%lx)\n", (unsigned long) src->addr));
+ }
}
else
{
if (dst > tab->base && dst[-1].end_addr == 0)
{
dst[-1].end_addr = src->addr - 1;
- } /* if */
+ }
/* retain sym only if it has a non-empty address range: */
if (!src->end_addr || src->addr <= src->end_addr)
{
- *dst++ = *src;
+ *dst = *src;
+ dst++;
prev_addr = src->addr;
- } /* if */
- } /* if */
- } /* if */
+ }
+ }
+ }
if (tab->len > 0 && dst[-1].end_addr == 0)
{
dst[-1].end_addr = core_text_sect->vma + core_text_sect->_raw_size - 1;
- } /* if */
+ }
DBG (AOUTDEBUG | IDDEBUG,
printf ("[symtab_finalize]: removed %d duplicate entries\n",
tab->len = tab->limit - tab->base;
DBG (AOUTDEBUG | IDDEBUG,
- int j;
+ unsigned int j;
for (j = 0; j < tab->len; ++j)
{
printf ("[symtab_finalize] 0x%lx-0x%lx\t%s\n",
(long) tab->base[j].addr, (long) tab->base[j].end_addr,
tab->base[j].name);
- } /* for */
+ }
);
-} /* symtab_finalize */
+}
#ifdef DEBUG
long low, mid, high;
Sym *sym;
- fprintf (stderr, "[sym_lookup] address 0x%lx\n", address);
+ fprintf (stderr, "[dbg_sym_lookup] address 0x%lx\n",
+ (unsigned long) address);
sym = symtab->base;
for (low = 0, high = symtab->len - 1; low != high;)
fprintf (stderr, "[dbg_sym_lookup] low=0x%lx, mid=0x%lx, high=0x%lx\n",
low, mid, high);
fprintf (stderr, "[dbg_sym_lookup] sym[m]=0x%lx sym[m + 1]=0x%lx\n",
- sym[mid].addr, sym[mid + 1].addr);
+ (unsigned long) sym[mid].addr,
+ (unsigned long) sym[mid + 1].addr);
if (sym[mid].addr <= address && sym[mid + 1].addr > address)
{
return &sym[mid];
- } /* if */
+ }
if (sym[mid].addr > address)
{
high = mid;
else
{
low = mid + 1;
- } /* if */
- } /* for */
- fprintf (stderr, "[sym_lookup] binary search fails???\n");
+ }
+ }
+ fprintf (stderr, "[dbg_sym_lookup] binary search fails???\n");
return 0;
-} /* dbg_sym_lookup */
+}
#endif /* DEBUG */
if (!symtab->len)
{
return 0;
- } /* if */
+ }
sym = symtab->base;
for (low = 0, high = symtab->len - 1; low != high;)
else
{
DBG (LOOKUPDEBUG,
- printf ("[sym_lookup] %d probes (symtab->len=%d)\n",
+ printf ("[sym_lookup] %d probes (symtab->len=%u)\n",
probes, symtab->len - 1));
return &sym[mid];
- } /* if */
- } /* if */
+ }
+ }
if (sym[mid].addr > address)
{
high = mid;
else
{
low = mid + 1;
- } /* if */
- } /* for */
+ }
+ }
if (sym[mid + 1].addr <= address)
{
if (address > sym[mid + 1].end_addr)
}
else
{
- DBG (LOOKUPDEBUG, printf ("[sym_lookup] %d (%d) probes, fall off\n",
+ DBG (LOOKUPDEBUG, printf ("[sym_lookup] %d (%u) probes, fall off\n",
probes, symtab->len - 1));
return &sym[mid + 1];
- } /* if */
- } /* if */
+ }
+ }
return 0;
-} /* sym_lookup */
-
-/*** end of symtab.c ***/
+}