X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Ftahoe.c;h=93d2997ea913571f2d19ea3e1a4303dc7a583381;hb=57d1de9cf3ba8dd98eaf4a3d131c05ec4c49779d;hp=55db2786ccb417edae63f2f0e425bac14fdf0083;hpb=43870aec5efd34c46f8d7d8422291030c5048fd8;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/tahoe.c b/gprof/tahoe.c index 55db2786cc..93d2997ea9 100644 --- a/gprof/tahoe.c +++ b/gprof/tahoe.c @@ -1,26 +1,38 @@ /* - * 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" -#include "symtab.h" /* * opcode of the `callf' instruction @@ -44,16 +56,20 @@ typedef enum tahoe_opermodes tahoe_operandenum; /* * A symbol to be the child of indirect callf: */ -Sym indirectchild; +static Sym indirectchild; +static tahoe_operandenum tahoe_operandmode (unsigned char *); +static char *tahoe_operandname (tahoe_operandenum); +static long tahoe_operandlength (unsigned char *); +static bfd_signed_vma tahoe_offset (unsigned char *); +void tahoe_find_call (Sym *, bfd_vma, bfd_vma); -tahoe_operandenum -tahoe_operandmode (modep) - unsigned char *modep; +static tahoe_operandenum +tahoe_operandmode (unsigned char *modep) { - long usesreg = ((long) *modep) & 0xf; + long usesreg = *modep & 0xf; - switch (((long) *modep) >> 4) + switch ((*modep >> 4) & 0xf) { case 0: case 1: @@ -89,9 +105,8 @@ tahoe_operandmode (modep) abort (); } -char * -tahoe_operandname (mode) - tahoe_operandenum mode; +static char * +tahoe_operandname (tahoe_operandenum mode) { switch (mode) @@ -143,9 +158,9 @@ tahoe_operandname (mode) abort (); } -long -tahoe_operandlength (modep) - unsigned char *modep; +static long +tahoe_operandlength (unsigned char *modep +) { switch (tahoe_operandmode (modep)) @@ -181,50 +196,36 @@ tahoe_operandlength (modep) abort (); } -bfd_vma -tahoe_reladdr (modep) - char *modep; +static bfd_signed_vma +tahoe_offset (unsigned char *modep) { tahoe_operandenum mode = tahoe_operandmode (modep); - char *cp; - short *sp; - long *lp; - int i; - long value = 0; - cp = modep; - ++cp; /* skip over the mode */ + ++modep; /* skip over the mode */ switch (mode) { default: fprintf (stderr, "[reladdr] not relative address\n"); - return (bfd_vma) modep; + return 0; case byterel: - return (bfd_vma) (cp + sizeof *cp + *cp); + return 1 + bfd_get_signed_8 (core_bfd, modep); case wordrel: - for (i = 0; (size_t) i < sizeof *sp; i++) - value = (value << 8) + (cp[i] & 0xff); - return (bfd_vma) (cp + sizeof *sp + value); + return 2 + bfd_get_signed_16 (core_bfd, modep); case longrel: - for (i = 0; (size_t) i < sizeof *lp; i++) - value = (value << 8) + (cp[i] & 0xff); - return (bfd_vma) (cp + sizeof *lp + value); + return 4 + bfd_get_signed_32 (core_bfd, modep); } } void -tahoe_find_call (parent, p_lowpc, p_highpc) - Sym *parent; - bfd_vma p_lowpc; - bfd_vma p_highpc; +tahoe_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) { unsigned char *instructp; long length; Sym *child; tahoe_operandenum mode; tahoe_operandenum firstmode; - bfd_vma destpc; - static bool inited = FALSE; + bfd_vma pc, destpc; + static bfd_boolean inited = FALSE; if (!inited) { @@ -234,33 +235,22 @@ tahoe_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, p_lowpc, p_highpc)); - for (instructp = (unsigned char *) core_text_space + p_lowpc; - instructp < (unsigned char *) core_text_space + p_highpc; - instructp += length) + parent->name, (unsigned long) p_lowpc, + (unsigned long) p_highpc)); + for (pc = p_lowpc; pc < p_highpc; pc += length) { length = 1; - if (*instructp == CALLF) + instructp = ((unsigned char *) core_text_space + + pc - core_text_sect->vma); + if ((*instructp & 0xff) == CALLF) { /* * maybe a callf, better check it out. * skip the count of the number of arguments. */ - DBG (CALLDEBUG, printf ("[findcall]\t0x%x:callf", - instructp - (unsigned char *) core_text_space)); + DBG (CALLDEBUG, printf ("[findcall]\t0x%lx:callf", + (unsigned long) pc)); firstmode = tahoe_operandmode (instructp + length); switch (firstmode) { @@ -293,7 +283,7 @@ tahoe_find_call (parent, p_lowpc, p_highpc) * [are there others that we miss?, * e.g. arrays of pointers to functions???] */ - arc_add (parent, &indirectchild, (long) 0); + arc_add (parent, &indirectchild, (unsigned long) 0); length += tahoe_operandlength (instructp + length); continue; case byterel: @@ -301,27 +291,31 @@ tahoe_find_call (parent, p_lowpc, p_highpc) case longrel: /* * regular pc relative addressing - * check that this is the address of + * check that this is the address of * a function. */ - destpc = tahoe_reladdr (instructp + length) - - (bfd_vma) core_text_space; - if (destpc >= s_lowpc && destpc <= s_highpc) + destpc = pc + tahoe_offset (instructp + length); + if (hist_check_address (destpc)) { child = sym_lookup (&symtab, destpc); - DBG (CALLDEBUG, - printf ("[findcall]\tdestpc 0x%lx", destpc); - printf (" child->name %s", child->name); - printf (" child->addr 0x%lx\n", child->addr); - ); - if (child->addr == destpc) + if (child) { - /* - * a hit - */ - arc_add (parent, child, (long) 0); - length += tahoe_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 += tahoe_operandlength (instructp + length); + continue; + } } goto botched; }