X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gprof%2Falpha.c;h=d84cdf0a916e01549ea560bc287f664714672c71;hb=c5316fc6e634858a3821e612e613342da562e0b3;hp=bcb4d9dd77a5916c4021bec18828f6e05273ea10;hpb=1355568ab48a9dcfd079493f7deb5e1c5e88015b;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/alpha.c b/gprof/alpha.c index bcb4d9dd77..d84cdf0a91 100644 --- a/gprof/alpha.c +++ b/gprof/alpha.c @@ -1,20 +1,30 @@ /* - * Copyright (c) 1983, 1998 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 1993, 1998 + * 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" @@ -27,48 +37,50 @@ /* * 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; -void alpha_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); +void alpha_find_call (Sym *, bfd_vma, bfd_vma); /* * On the Alpha we can only detect PC relative calls, which are @@ -78,10 +90,7 @@ void alpha_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); * potentially call integer division routines, for example.) */ void -alpha_find_call (parent, p_lowpc, p_highpc) - Sym *parent; - bfd_vma p_lowpc; - bfd_vma p_highpc; +alpha_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) { bfd_vma pc, dest_pc; unsigned int insn; @@ -95,18 +104,6 @@ alpha_find_call (parent, p_lowpc, 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)); @@ -114,7 +111,7 @@ alpha_find_call (parent, p_lowpc, 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: /* @@ -148,20 +145,23 @@ alpha_find_call (parent, p_lowpc, 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.