X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Falpha.c;h=d84cdf0a916e01549ea560bc287f664714672c71;hb=d16c467a501547e37b111f775396e28f8bf27c1e;hp=83c4009d59e002bf3897c1687042dadbaa9b3c60;hpb=3e8f6abf1e13bfd39a48b297f2679f5dd5fe6a3a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/alpha.c b/gprof/alpha.c
index 83c4009d59..d84cdf0a91 100644
--- a/gprof/alpha.c
+++ b/gprof/alpha.c
@@ -37,44 +37,46 @@
 /*
  * Opcodes of the call instructions:
  */
-#define OP_Jxx	0x1a
-#define	OP_BSR	0x34
+#define OP_Jxx	0x1aU
+#define	OP_BSR	0x34U
 
-#define Jxx_FUNC_JMP		0
-#define Jxx_FUNC_JSR		1
-#define Jxx_FUNC_RET		2
-#define Jxx_FUNC_JSR_COROUTINE	3
+#define Jxx_FUNC_JMP		0U
+#define Jxx_FUNC_JSR		1U
+#define Jxx_FUNC_RET		2U
+#define Jxx_FUNC_JSR_COROUTINE	3U
 
-#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.  */
-typedef union
-  {
-    struct
-      {
-	unsigned other:26;
-	unsigned op_code:6;
-      }
-    a;				/* any format */
-    struct
-      {
-	int disp:21;
-	unsigned ra:5;
-	unsigned op_code:6;
-      }
-    b;				/* branch format */
-    struct
-      {
-	int hint:14;
-	unsigned func:2;
-	unsigned rb:5;
-	unsigned ra:5;
-	unsigned op_code:6;
-      }
-    j;				/* jump format */
-  }
-alpha_Instruction;
-#endif
+   the bitfield layout might not be the same as native.
+
+   typedef union
+     {
+       struct
+         {
+	   unsigned other:26;
+	   unsigned op_code:6;
+         }
+       a;				-- any format
+       struct
+         {
+	   int disp:21;
+	   unsigned ra:5;
+	   unsigned op_code:6;
+         }
+       b;				-- branch format
+       struct
+         {
+	   int hint:14;
+	   unsigned func:2;
+	   unsigned rb:5;
+	   unsigned ra:5;
+	   unsigned op_code:6;
+         }
+       j;				-- jump format
+     }
+    alpha_Instruction;
+*/
+/* *INDENT-ON* */
 
 static Sym indirect_child;
 
@@ -102,18 +104,6 @@ alpha_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
       indirect_child.cg.cyc.head = &indirect_child;
     }
 
-  if (!core_text_space)
-    {
-      return;
-    }
-  if (p_lowpc < s_lowpc)
-    {
-      p_lowpc = s_lowpc;
-    }
-  if (p_highpc > s_highpc)
-    {
-      p_highpc = s_highpc;
-    }
   DBG (CALLDEBUG, printf (_("[find_call] %s: 0x%lx to 0x%lx\n"),
 			  parent->name, (unsigned long) p_lowpc,
 			  (unsigned long) p_highpc));
@@ -121,7 +111,7 @@ alpha_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
     {
       insn = bfd_get_32 (core_bfd, ((unsigned char *) core_text_space
 				    + pc - core_text_sect->vma));
-      switch (insn & (0x3f << 26))
+      switch (insn & (0x3fU << 26))
 	{
 	case OP_Jxx << 26:
 	  /*
@@ -155,20 +145,23 @@ alpha_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc)
 	   */
 	  dest_pc = pc + 4 + (((bfd_signed_vma) (insn & 0x1fffff)
 			       ^ 0x100000) - 0x100000);
-	  if (dest_pc >= s_lowpc && dest_pc <= s_highpc)
+	  if (hist_check_address (dest_pc))
 	    {
 	      child = sym_lookup (&symtab, dest_pc);
-	      DBG (CALLDEBUG,
-		   printf (" 0x%lx\t; name=%s, addr=0x%lx",
-			   (unsigned long) dest_pc, child->name,
-			   (unsigned long) child->addr));
-	      if (child->addr == dest_pc || child->addr == dest_pc - 8)
-		{
-		  DBG (CALLDEBUG, printf ("\n"));
-		  /* a hit:  */
-		  arc_add (parent, child, (unsigned long) 0);
-		  continue;
-		}
+              if (child)
+                {
+	          DBG (CALLDEBUG,
+		       printf (" 0x%lx\t; name=%s, addr=0x%lx",
+			       (unsigned long) dest_pc, child->name,
+			       (unsigned long) child->addr));
+	          if (child->addr == dest_pc || child->addr == dest_pc - 8)
+		    {
+		      DBG (CALLDEBUG, printf ("\n"));
+		      /* a hit:  */
+		      arc_add (parent, child, (unsigned long) 0);
+		      continue;
+		    }
+                }
 	    }
 	  /*
 	   * Something funny going on.