X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fvax.c;h=99719b9fb7e110d2f4204d15329a9805b809416e;hb=8cd0e5e93145699736a370b271ff03f3f41670b0;hp=bbecff99c65532567f2bcc7b0007fe3c225add82;hpb=6d9c411afd0301f0262ff63d6dc59dac38f58e63;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/vax.c b/gprof/vax.c
index bbecff99c6..99719b9fb7 100644
--- a/gprof/vax.c
+++ b/gprof/vax.c
@@ -1,20 +1,30 @@
 /*
- * Copyright (c) 1983, 2001 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"
@@ -43,30 +53,31 @@ enum opermodes
   };
 typedef enum opermodes operandenum;
 
-#if 0
+/* *INDENT-OFF* */
 /* Here to document only.  We can't use this when cross compiling as
-   the bitfield layout might not be the same as native.  */
-struct modebyte
-  {
-    unsigned int regfield:4;
-    unsigned int modefield:4;
-  };
-#endif
+   the bitfield layout might not be the same as native.
+
+   struct modebyte
+     {
+       unsigned int regfield:4;
+       unsigned int modefield:4;
+     };
+*/
+/* *INDENT-ON* */
 
 /*
  * A symbol to be the child of indirect calls:
  */
 static Sym indirectchild;
 
-static operandenum vax_operandmode PARAMS ((unsigned char *));
-static char *vax_operandname PARAMS ((operandenum));
-static long vax_operandlength PARAMS ((unsigned char *));
-static bfd_signed_vma vax_offset PARAMS ((unsigned char *));
-void vax_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
+static operandenum vax_operandmode (unsigned char *);
+static char *vax_operandname (operandenum);
+static long vax_operandlength (unsigned char *);
+static bfd_signed_vma vax_offset (unsigned char *);
+void vax_find_call (Sym *, bfd_vma, bfd_vma);
 
 static operandenum
-vax_operandmode (modep)
-     unsigned char *modep;
+vax_operandmode (unsigned char *modep)
 {
   int usesreg = *modep & 0xf;
 
@@ -107,8 +118,7 @@ vax_operandmode (modep)
 }
 
 static char *
-vax_operandname (mode)
-     operandenum mode;
+vax_operandname (operandenum mode)
 {
 
   switch (mode)
@@ -161,8 +171,7 @@ vax_operandname (mode)
 }
 
 static long
-vax_operandlength (modep)
-     unsigned char *modep;
+vax_operandlength (unsigned char *modep)
 {
 
   switch (vax_operandmode (modep))
@@ -199,8 +208,7 @@ vax_operandlength (modep)
 }
 
 static bfd_signed_vma
-vax_offset (modep)
-     unsigned char *modep;
+vax_offset (unsigned char *modep)
 {
   operandenum mode = vax_operandmode (modep);
 
@@ -221,10 +229,7 @@ vax_offset (modep)
 
 
 void
-vax_find_call (parent, p_lowpc, p_highpc)
-     Sym *parent;
-     bfd_vma p_lowpc;
-     bfd_vma p_highpc;
+vax_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
 {
   unsigned char *instructp;
   long length;
@@ -232,7 +237,7 @@ vax_find_call (parent, p_lowpc, p_highpc)
   operandenum mode;
   operandenum firstmode;
   bfd_vma pc, destpc;
-  static bool inited = FALSE;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
     {
@@ -242,18 +247,6 @@ vax_find_call (parent, p_lowpc, p_highpc)
       indirectchild.cg.cyc.head = &indirectchild;
     }
 
-  if (core_text_space == 0)
-    {
-      return;
-    }
-  if (p_lowpc < s_lowpc)
-    {
-      p_lowpc = s_lowpc;
-    }
-  if (p_highpc > s_highpc)
-    {
-      p_highpc = s_highpc;
-    }
   DBG (CALLDEBUG, printf ("[findcall] %s: 0x%lx to 0x%lx\n",
 			  parent->name, (unsigned long) p_lowpc,
 			  (unsigned long) p_highpc));
@@ -313,24 +306,27 @@ vax_find_call (parent, p_lowpc, p_highpc)
 	       *      a function.
 	       */
 	      destpc = pc + vax_offset (instructp + length);
-	      if (destpc >= s_lowpc && destpc <= s_highpc)
+	      if (hist_check_address (destpc))
 		{
 		  child = sym_lookup (&symtab, destpc);
-		  DBG (CALLDEBUG,
-		       printf ("[findcall]\tdestpc 0x%lx",
-			       (unsigned long) destpc);
-		       printf (" child->name %s", child->name);
-		       printf (" child->addr 0x%lx\n",
-			       (unsigned long) child->addr);
-		    );
-		  if (child->addr == destpc)
+		  if (child)
 		    {
-		      /*
-		       *    a hit
-		       */
-		      arc_add (parent, child, (unsigned long) 0);
-		      length += vax_operandlength (instructp + length);
-		      continue;
+		      DBG (CALLDEBUG,
+		           printf ("[findcall]\tdestpc 0x%lx",
+			           (unsigned long) destpc);
+		           printf (" child->name %s", child->name);
+		           printf (" child->addr 0x%lx\n",
+			           (unsigned long) child->addr);
+		        );
+		      if (child->addr == destpc)
+		        {
+		          /*
+		           *    a hit
+		           */
+		          arc_add (parent, child, (unsigned long) 0);
+		          length += vax_operandlength (instructp + length);
+		          continue;
+		        }
 		    }
 		  goto botched;
 		}