* objdump.c (SFILE): Add size field.

[deliverable/binutils-gdb.git] / gprof / symtab.c

diff --git a/gprof/symtab.c b/gprof/symtab.c
index aab4ca269e16a32e28c14dae1b2627abb168b9ec..182c6574b4c9bb9c68afff89fd8b086a5ded5f36 100644 (file)
--- a/gprof/symtab.c
+++ b/gprof/symtab.c
@@ -1,6 +1,6 @@
 #include "gprof.h"
 #include "cg_arcs.h"
-#include "core.h"
+#include "corefile.h"
 #include "symtab.h"
 
 Sym_Table symtab;
@@ -22,7 +22,7 @@ DEFUN (sym_init, (sym), Sym * sym)
   sym->cg.prop.fract = 0.0;
   sym->cg.prop.self = 0.0;
   sym->cg.prop.child = 0.0;
-}                              /* sym_init */
+}
 
 
 /*
@@ -48,15 +48,15 @@ DEFUN (cmp_addr, (lp, rp), const PTR lp AND const PTR rp)
   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
@@ -68,7 +68,7 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
   if (!tab->len)
     {
       return;
-    }                          /* if */
+    }
 
   /*
    * Sort symbol table in order of increasing function addresses:
@@ -85,18 +85,22 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
       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",
@@ -116,27 +120,27 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
                           src->name, src->is_static ? 't' : 'T',
                           src->is_func ? 'F' : 'f');
                   printf (" (addr=%lx)\n", src->addr));
-           }                   /* if */
+           }
        }
       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;
              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",
@@ -146,16 +150,16 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
   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
@@ -166,7 +170,7 @@ DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address
   long low, mid, high;
   Sym *sym;
 
-  fprintf (stderr, "[sym_lookup] address 0x%lx\n", address);
+  fprintf (stderr, "[dbg_sym_lookup] address 0x%lx\n", address);
 
   sym = symtab->base;
   for (low = 0, high = symtab->len - 1; low != high;)
@@ -179,7 +183,7 @@ DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address
       if (sym[mid].addr <= address && sym[mid + 1].addr > address)
        {
          return &sym[mid];
-       }                       /* if */
+       }
       if (sym[mid].addr > address)
        {
          high = mid;
@@ -187,11 +191,11 @@ DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address
       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 */
 
@@ -213,7 +217,7 @@ DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
   if (!symtab->len)
     {
       return 0;
-    }                          /* if */
+    }
 
   sym = symtab->base;
   for (low = 0, high = symtab->len - 1; low != high;)
@@ -233,11 +237,11 @@ DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
          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;
@@ -245,8 +249,8 @@ DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
       else
        {
          low = mid + 1;
-       }                       /* if */
-    }                          /* for */
+       }
+    }
   if (sym[mid + 1].addr <= address)
     {
       if (address > sym[mid + 1].end_addr)
@@ -256,12 +260,10 @@ DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
        }
       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 ***/
+}