daily update

[binutils.git] / gprof / mips.c

diff --git a/gprof/mips.c b/gprof/mips.c
index 1c5fd33f07e9c1420c2a9bbff1b4a03336245788..2de87cfb578a040917dee5d95b71fa818c6a09c9 100644 (file)
--- a/gprof/mips.c
+++ b/gprof/mips.c
@@ -36,47 +36,33 @@
 
 static Sym indirect_child;
 
-void mips_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
+void mips_find_call (Sym *, bfd_vma, bfd_vma);
 
 void
-mips_find_call (parent, p_lowpc, p_highpc)
-     Sym *parent;
-     bfd_vma p_lowpc;
-     bfd_vma p_highpc;
+mips_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
 {
   bfd_vma pc, dest_pc;
   unsigned int op;
   int offset;
   Sym *child;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
     {
-      inited = true;
+      inited = TRUE;
       sym_init (&indirect_child);
       indirect_child.name = _("<indirect child>");
       indirect_child.cg.prop.fract = 1.0;
       indirect_child.cg.cyc.head = &indirect_child;
     }
 
-  if (!core_text_space)
-    {
-      return;
-    }
-  if (p_lowpc < s_lowpc)
-    {
-      p_lowpc = s_lowpc;
-    }
-  if (p_highpc > s_highpc)
-    {
-      p_highpc = s_highpc;
-    }
   DBG (CALLDEBUG, printf (_("[find_call] %s: 0x%lx to 0x%lx\n"),
                          parent->name, (unsigned long) p_lowpc,
                          (unsigned long) p_highpc));
   for (pc = p_lowpc; pc < p_highpc; pc += 4)
     {
-      op = bfd_get_32 (core_bfd, &((char *)core_text_space)[pc - s_lowpc]);
+      op = bfd_get_32 (core_bfd, ((unsigned char *)core_text_space
+                                 + pc - core_text_sect->vma));
       if ((op & 0xfc000000) == 0x0c000000)
        {
          /* This is a "jal" instruction.  Check that the destination
@@ -85,19 +71,22 @@ mips_find_call (parent, p_lowpc, p_highpc)
               printf (_("[find_call] 0x%lx: jal"), (unsigned long) pc));
           offset = (op & 0x03ffffff) << 2;
          dest_pc = (pc & ~(bfd_vma) 0xfffffff) | offset;
-         if (dest_pc >= s_lowpc && dest_pc <= s_highpc)
+         if (hist_check_address (dest_pc))
            {
              child = sym_lookup (&symtab, dest_pc);
-             DBG (CALLDEBUG,
-                  printf (" 0x%lx\t; name=%s, addr=0x%lx",
-                          (unsigned long) dest_pc, child->name,
-                          (unsigned long) child->addr));
-             if (child->addr == dest_pc)
+              if (child)
                {
-                 DBG (CALLDEBUG, printf ("\n"));
-                 /* a hit:  */
-                 arc_add (parent, child, (unsigned long) 0);
-                 continue;
+                 DBG (CALLDEBUG,
+                      printf (" 0x%lx\t; name=%s, addr=0x%lx",
+                              (unsigned long) dest_pc, child->name,
+                              (unsigned long) child->addr));
+                 if (child->addr == dest_pc)
+                   {
+                     DBG (CALLDEBUG, printf ("\n"));
+                     /* a hit:  */
+                     arc_add (parent, child, (unsigned long) 0);
+                     continue;
+                   }
                }
            }
          /* Something funny going on.  */