Update section on kernel debugging.

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

diff --git a/gprof/symtab.c b/gprof/symtab.c
index 0b6a4af9a5714c8ef2834d3581679a7ce44daeed..e4fda46533f86e477c3958c2188a0415f8ba7478 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;
@@ -108,7 +108,7 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
                           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
@@ -119,7 +119,7 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
                           dst[-1].is_func ? 'F' : 'f',
                           src->name, src->is_static ? 't' : 'T',
                           src->is_func ? 'F' : 'f');
-                  printf (" (addr=%lx)\n", src->addr));
+                  printf (" (addr=%lx)\n", (unsigned long) src->addr));
            }
        }
       else
@@ -132,7 +132,8 @@ DEFUN (symtab_finalize, (tab), Sym_Table * tab)
          /* 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;
            }
        }
@@ -150,7 +151,7 @@ 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)
        {
@@ -170,7 +171,8 @@ DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address
   long low, mid, high;
   Sym *sym;
 
-  fprintf (stderr, "[dbg_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;)
@@ -179,7 +181,8 @@ DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address
       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];
@@ -237,7 +240,7 @@ 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];
            }
@@ -260,7 +263,7 @@ 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];
        }