X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gprof%2Fi386.c;h=91d38fa06cb53838173e5a344f20e47cdb5074ef;hb=19a7219fd198b980a70cdbdc158b96cd5446e7f3;hp=219be72091ec75ee70323de55e4d90957d255e81;hpb=5489fcc3d9dbb1f529dddb19b615e23d8ed59dc7;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/i386.c b/gprof/i386.c
index 219be72091..91d38fa06c 100644
--- a/gprof/i386.c
+++ b/gprof/i386.c
@@ -1,103 +1,112 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #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 (unsigned char *);
+void i386_find_call (Sym *, bfd_vma, bfd_vma);
 
-int
-DEFUN(iscall, (ip), unsigned char *ip)
+static int
+i386_iscall (unsigned char *ip)
 {
-  if (*ip == 0xeb || *ip == 0x9a) 
+  if (*ip == 0xe8)
     return 1;
   return 0;
 }
 
 
 void
-find_call(parent, p_lowpc, p_highpc)
-    Sym *parent;
-    bfd_vma p_lowpc;
-    bfd_vma p_highpc;
+i386_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
 {
-    unsigned char *instructp;
-    long length;
-    Sym *child;
-    bfd_vma destpc;
+  unsigned char *instructp;
+  Sym *child;
+  bfd_vma pc, destpc;
 
-    if (core_text_space == 0) {
-	return;
+  if (core_text_space == 0)
+    {
+      return;
     }
-    if (p_lowpc < s_lowpc) {
-	p_lowpc = s_lowpc;
+  if (p_lowpc < s_lowpc)
+    {
+      p_lowpc = s_lowpc;
     }
-    if (p_highpc > s_highpc) {
-	p_highpc = s_highpc;
+  if (p_highpc > s_highpc)
+    {
+      p_highpc = s_highpc;
     }
-    DBG(CALLDEBUG, printf("[findcall] %s: 0x%lx to 0x%lx\n",
-			  parent->name, p_lowpc, p_highpc));
-    for (  instructp = (unsigned char*) core_text_space + p_lowpc ;
-	    instructp < (unsigned char*) core_text_space + p_highpc ;
-	    instructp += length) {
-	length = 1;
-	if (iscall (instructp)) {
-	    DBG(CALLDEBUG,
-		printf("[findcall]\t0x%x:callf",
-		       instructp - (unsigned char*) core_text_space));
-	  length = 4;
+  DBG (CALLDEBUG, printf ("[findcall] %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)
+    {
+      instructp = (unsigned char *) core_text_space + pc - core_text_sect->vma;
+      if (i386_iscall (instructp))
+	{
+	  DBG (CALLDEBUG,
+	       printf ("[findcall]\t0x%lx:call", (unsigned long) pc));
 	  /*
-	   *	regular pc relative addressing
-	   *	check that this is the address of 
-	   *	a function.
+	   *  regular pc relative addressing
+	   *    check that this is the address of
+	   *    a function.
 	   */
-	  destpc = ((bfd_vma)instructp + 5 - (bfd_vma) core_text_space);
-	  if (destpc >= s_lowpc && destpc <= s_highpc) {
-	    child = sym_lookup(&symtab, destpc);
-	    DBG(CALLDEBUG,
-		printf("[findcall]\tdestpc 0x%lx", destpc);
-		printf(" child->name %s", child->name);
-		printf(" child->addr 0x%lx\n", child->addr);
-		);
-	    if (child->addr == destpc) {
-	      /*
-	       *	a hit
-	       */
-	      arc_add(parent, child, (long) 0);
-	      length += 4;	/* constant lengths */
-	      continue;
+
+	  destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5;
+	  if (destpc >= s_lowpc && destpc <= s_highpc)
+	    {
+	      child = sym_lookup (&symtab, destpc);
+	      if (child && child->addr == destpc)
+		{
+		  /*
+		   *      a hit
+		   */
+		  DBG (CALLDEBUG,
+		       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;
+		}
 	    }
-	    goto botched;
-	  }
 	  /*
-	   *	else:
-	   *	it looked like a callf,
-	   *	but it wasn't to anywhere.
+	   *  else:
+	   *    it looked like a callf, but it:
+	   *      a) wasn't actually a callf, or
+	   *      b) didn't point to a known function in the symtab, or
+	   *      c) something funny is going on.
 	   */
-	botched:
-	  /*
-	   *	something funny going on.
-	   */
-	    DBG(CALLDEBUG, printf("[findcall]\tbut it's a botch\n"));
-	    length = 1;
-	    continue;
+	  DBG (CALLDEBUG, printf ("\tbut it's a botch\n"));
 	}
-      }
-  }
+    }
+}