Lots of changes from David Mosberger-Tang; see ChangeLog and NOTES for details:

Alpha support.
Long options.
New file format to support more information; backwards compatibility.
Line-level profiling, on systems where bfd_find_nearest_line works.
Selective display of data.

1 files changed, 55 insertions, 107 deletions

diff --git a/gprof/sparc.c b/gprof/sparc.c
index 2fd7c65..98e29ce 100644
--- a/gprof/sparc.c
+++ b/gprof/sparc.c
@@ -16,116 +16,64 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include "gprof.h"
+#include "cg_arcs.h"
+#include "core.h"
+#include "hist.h"
+#include "symtab.h"
 
-#ifndef lint
-static char sccsid[] = "@(#)tahoe.c	1.5 (Berkeley) 6/1/90";
-#endif /* not lint */
 
-#include	"gprof.h"
-
-    /*
-     *	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 */
-    };
-
-findcall( parentp , p_lowpc , p_highpc )
-    nltype		*parentp;
-    unsigned long	p_lowpc;
-    unsigned long	p_highpc;
+void
+find_call(parent, p_lowpc, p_highpc)
+     Sym *parent;
+     bfd_vma p_lowpc;
+     bfd_vma p_highpc;
 {
-    unsigned char	*instructp;
-    long		length;
-    nltype		*childp;
-    unsigned long	destpc;
-
-    if ( textspace == 0 ) {
+    bfd_vma dest_pc, delta;
+    unsigned int *instr;
+    Sym *child;
+    
+    delta = (bfd_vma) core_text_space - core_text_sect->vma;
+    
+    if (core_text_space == 0) {
 	return;
-    }
-    if ( p_lowpc < s_lowpc ) {
+    } /* if */
+    if (p_lowpc < s_lowpc) {
 	p_lowpc = s_lowpc;
-    }
-    if ( p_highpc > s_highpc ) {
+    } /* if */
+    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 ( (*instructp & CALL) ) {
-#	    ifdef DEBUG
-	  if ( debug & CALLDEBUG ) {
-	    printf( "[findcall]\t0x%x:callf" , instructp - textspace );
-	  }
-#	    endif DEBUG
-	  length = 4;	/* constant length in a SPARC */
-	  /*
-	   *	regular pc relative addressing
-	   *	check that this is the address of 
-	   *	a function.
-	   */
-	  destpc = ( (unsigned long)instructp + (*(long *)instructp & ~CALL) )
-	    - (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;
-	    }
-	    goto botched;
-	  }
-	  /*
-	   *	else:
-	   *	it looked like a callf,
-	   *	but it wasn't to anywhere.
-	   */
-	botched:
-	  /*
-	   *	something funny going on.
-	   */
-#		    ifdef DEBUG
-	  if ( debug & CALLDEBUG ) {
-	    printf( "[findcall]\tbut it's a botch\n" );
-	  }
-#		    endif DEBUG
-	  length = 1;
-	  continue;
-	}
-      }
-  }
+    } /* if */
+    DBG(CALLDEBUG, printf("[find_call] %s: 0x%lx to 0x%lx\n",
+			  parent->name, p_lowpc, p_highpc));
+    for (instr = (unsigned int*)(p_lowpc + delta);
+	 instr < (unsigned int*)(p_highpc + delta);
+	 ++instr)
+    {
+	if ((*instr & CALL)) {
+	    DBG(CALLDEBUG,
+		printf("[find_call] 0x%lx: callf", (bfd_vma) instr - delta));
+	    /*
+	     * Regular pc relative addressing check that this is the
+	     * address of a function.
+	     */
+	    dest_pc = ((bfd_vma) (instr + (*instr & ~CALL))) - delta;
+	    if (dest_pc >= s_lowpc && dest_pc <= s_highpc) {
+		child = sym_lookup(&symtab, dest_pc);
+		DBG(CALLDEBUG,
+		    printf("\tdest_pc=0x%lx, (name=%s, addr=0x%lx)\n",
+			   dest_pc, child->name, child->addr));
+		if (child->addr == dest_pc) {
+		    /* a hit:  */
+		    arc_add(parent, child, 0);
+		    continue;
+		} /* if */
+	    } /* if */
+	    /*
+	     * Something funny going on.
+	     */
+	    DBG(CALLDEBUG, printf("\tbut it's a botch\n"));
+	} /* if */
+    } /* for */
+} /* find_call */
+			/*** end of sparc.c ***/