X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fi386.c;h=bdf8bd1b83206db11f203303224d456a1d86f053;hb=4a422785822ec9302f681c8fbc6ba2cc35231b09;hp=0fcaa78a71970f7b841565a62fdd1d040273a067;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/i386.c b/gprof/i386.c index 0fcaa78a71..bdf8bd1b83 100644 --- a/gprof/i386.c +++ b/gprof/i386.c @@ -34,12 +34,11 @@ #include "corefile.h" #include "hist.h" -static int i386_iscall PARAMS ((unsigned char *)); -void i386_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); +static int i386_iscall (unsigned char *); +void i386_find_call (Sym *, bfd_vma, bfd_vma); static int -i386_iscall (ip) - unsigned char *ip; +i386_iscall (unsigned char *ip) { if (*ip == 0xe8) return 1; @@ -48,27 +47,12 @@ i386_iscall (ip) void -i386_find_call (parent, p_lowpc, p_highpc) - Sym *parent; - bfd_vma p_lowpc; - bfd_vma p_highpc; +i386_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) { unsigned char *instructp; Sym *child; bfd_vma pc, destpc; - 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)); @@ -87,7 +71,7 @@ i386_find_call (parent, p_lowpc, p_highpc) */ destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5; - if (destpc >= s_lowpc && destpc <= s_highpc) + if (hist_check_address (destpc)) { child = sym_lookup (&symtab, destpc); if (child && child->addr == destpc)