X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gprof%2Fi386.c;h=bdf8bd1b83206db11f203303224d456a1d86f053;hb=de54374205650be71237ce51ef7981d30ddd78dc;hp=50e99803efac490316c230fff0cc7cc6dbedc499;hpb=46f88c11388317086f7963b7ff3cfdd0aad48941;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/i386.c b/gprof/i386.c
index 50e99803ef..bdf8bd1b83 100644
--- a/gprof/i386.c
+++ b/gprof/i386.c
@@ -1,143 +1,100 @@
 /*
- * 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 "corefile.h"
+#include "hist.h"
 
-#ifndef lint
-static char sccsid[] = "@(#)tahoe.c	1.5 (Berkeley) 6/1/90";
-#endif /* not lint */
-
-#include	"gprof.h"
+static int i386_iscall (unsigned char *);
+void i386_find_call (Sym *, bfd_vma, bfd_vma);
 
-    /*
-     *	a namelist entry to be the child of indirect callf
-     */
-nltype	indirectchild = {
-	"(*)" ,				/* the name */
-	(unsigned long) 0 ,		/* the pc entry point */
-	(unsigned long) 0 ,		/* entry point aligned to histogram */
-	(double) 0.0 ,			/* ticks in this routine */
-	(double) 0.0 ,			/* cumulative ticks in children */
-	(long) 0 ,			/* how many times called */
-	(long) 0 ,			/* how many calls to self */
-	(double) 1.0 ,			/* propagation fraction */
-	(double) 0.0 ,			/* self propagation time */
-	(double) 0.0 ,			/* child propagation time */
-	(bool) 0 ,			/* print flag */
-	(int) 0 ,			/* index in the graph list */
-	(int) 0 , 			/* graph call chain top-sort order */
-	(int) 0 ,			/* internal number of cycle on */
-	(struct nl *) &indirectchild ,	/* pointer to head of cycle */
-	(struct nl *) 0 ,		/* pointer to next member of cycle */
-	(arctype *) 0 ,			/* list of caller arcs */
-	(arctype *) 0 			/* list of callee arcs */
-    };
-
-#ifdef	__STDC__
-int
-iscall (unsigned char *ip)
-#else
-int iscall(ip)
-	unsigned char *ip;
-#endif	/* __STDC__ */
+static int
+i386_iscall (unsigned char *ip)
 {
-  if (*ip == 0xeb || *ip == 0x9a) 
+  if (*ip == 0xe8)
     return 1;
   return 0;
 }
 
-findcall( parentp , p_lowpc , p_highpc )
-    nltype		*parentp;
-    unsigned long	p_lowpc;
-    unsigned long	p_highpc;
+
+void
+i386_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
 {
-    unsigned char	*instructp;
-    long		length;
-    nltype		*childp;
-    unsigned long	destpc;
+  unsigned char *instructp;
+  Sym *child;
+  bfd_vma pc, destpc;
 
-    if ( textspace == 0 ) {
-	return;
-    }
-    if ( p_lowpc < s_lowpc ) {
-	p_lowpc = s_lowpc;
-    }
-    if ( p_highpc > s_highpc ) {
-	p_highpc = s_highpc;
-    }
-#   ifdef DEBUG
-	if ( debug & CALLDEBUG ) {
-	    printf( "[findcall] %s: 0x%x to 0x%x\n" ,
-		    parentp -> name , p_lowpc , p_highpc );
-	}
-#   endif DEBUG
-    for (   instructp = textspace + p_lowpc ;
-	    instructp < textspace + p_highpc ;
-	    instructp += length ) {
-	length = 1;
-	if ( iscall (instructp) ) {
-#	    ifdef DEBUG
-	  if ( debug & CALLDEBUG ) {
-	    printf( "[findcall]\t0x%x:callf" , instructp - textspace );
-	  }
-#	    endif DEBUG
-	  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 = ( (unsigned long)instructp + 5 - (unsigned long) textspace);
-	  if ( destpc >= s_lowpc && destpc <= s_highpc ) {
-	    childp = nllookup( destpc );
-#			ifdef DEBUG
-	    if ( debug & CALLDEBUG ) {
-	      printf( "[findcall]\tdestpc 0x%x" , destpc );
-	      printf( " childp->name %s" , childp -> name );
-	      printf( " childp->value 0x%x\n" ,
-		     childp -> value );
-	    }
-#			endif DEBUG
-	    if ( childp -> value == destpc ) {
-	      /*
-	       *	a hit
-	       */
-	      addarc( parentp , childp , (long) 0 );
-	      length += 4;	/* constant lengths */
-	      continue;
+
+	  destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5;
+	  if (hist_check_address (destpc))
+	    {
+	      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.
-	   */
-#		    ifdef DEBUG
-	  if ( debug & CALLDEBUG ) {
-	    printf( "[findcall]\tbut it's a botch\n" );
-	  }
-#		    endif DEBUG
-	  length = 1;
-	  continue;
+	  DBG (CALLDEBUG, printf ("\tbut it's a botch\n"));
 	}
-      }
-  }
+    }
+}