update translations.

[binutils.git] / gprof / i386.c

diff --git a/gprof/i386.c b/gprof/i386.c
index d09d34ed5a1aad35f04580e6508381a7b9c6fe56..af2731c1f0fcab62937c6c77c3850749c42c33a9 100644 (file)
--- a/gprof/i386.c
+++ b/gprof/i386.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
+ * Copyright (c) 1983, 2001 Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -17,14 +17,19 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
-#include "core.h"
+#include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
+static int i386_iscall PARAMS ((unsigned char *));
+void i386_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 
-int
-DEFUN (i386_iscall, (ip), unsigned char *ip)
+static int
+i386_iscall (ip)
+     unsigned char *ip;
 {
   if (*ip == 0xe8)
     return 1;
@@ -40,7 +45,7 @@ i386_find_call (parent, p_lowpc, p_highpc)
 {
   unsigned char *instructp;
   Sym *child;
-  bfd_vma destpc, delta;
+  bfd_vma pc, destpc;
 
   if (core_text_space == 0)
     {
@@ -55,27 +60,23 @@ i386_find_call (parent, p_lowpc, p_highpc)
       p_highpc = s_highpc;
     }
   DBG (CALLDEBUG, printf ("[findcall] %s: 0x%lx to 0x%lx\n",
-                         parent->name, p_lowpc, p_highpc));
-
-  delta = (bfd_vma) core_text_space - core_text_sect->vma;
+                         parent->name, (unsigned long) p_lowpc,
+                         (unsigned long) p_highpc));
 
-  for (instructp = (unsigned char *) (p_lowpc + delta);
-       instructp < (unsigned char *) (p_highpc + delta);
-       instructp ++)
+  for (pc = p_lowpc; pc < p_highpc; ++pc)
     {
+      instructp = (unsigned char *) core_text_space + pc - core_text_sect->vma;
       if (i386_iscall (instructp))
        {
          DBG (CALLDEBUG,
-              printf ("[findcall]\t0x%x:call",
-                      instructp - (unsigned char *) delta));
+              printf ("[findcall]\t0x%lx:call", (unsigned long) pc));
          /*
           *  regular pc relative addressing
-          *    check that this is the address of 
+          *    check that this is the address of
           *    a function.
           */
 
-         destpc = ((bfd_vma) bfd_get_32 (core_bfd, instructp + 1)
-                   + (bfd_vma) instructp - (bfd_vma) delta + 5);
+         destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5;
          if (destpc >= s_lowpc && destpc <= s_highpc)
            {
              child = sym_lookup (&symtab, destpc);
@@ -85,8 +86,9 @@ i386_find_call (parent, p_lowpc, p_highpc)
                   *      a hit
                   */
                  DBG (CALLDEBUG,
-                      printf ("\tdestpc 0x%lx (%s)\n", destpc, child->name));
-                 arc_add (parent, child, (long) 0);
+                      printf ("\tdestpc 0x%lx (%s)\n",
+                              (unsigned long) destpc, child->name));
+                 arc_add (parent, child, (unsigned long) 0);
                  instructp += 4;       /* call is a 5 byte instruction */
                  continue;
                }