diff options
Diffstat (limited to 'gprof/i386.c')
| -rw-r--r-- | gprof/i386.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gprof/i386.c b/gprof/i386.c index e30648f..af2731c 100644 --- a/gprof/i386.c +++ b/gprof/i386.c @@ -17,10 +17,12 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #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" static int i386_iscall PARAMS ((unsigned char *)); void i386_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); @@ -43,7 +45,7 @@ i386_find_call (parent, p_lowpc, p_highpc) { unsigned char *instructp; Sym *child; - bfd_vma destpc, delta; + bfd_vma pc, destpc; if (core_text_space == 0) { @@ -61,25 +63,20 @@ i386_find_call (parent, p_lowpc, p_highpc) parent->name, (unsigned long) p_lowpc, (unsigned long) p_highpc)); - delta = (bfd_vma) core_text_space - core_text_sect->vma; - - for (instructp = (unsigned char *) (p_lowpc + delta); - instructp < (unsigned char *) (p_highpc + delta); - instructp ++) + for (pc = p_lowpc; pc < p_highpc; ++pc) { + instructp = (unsigned char *) core_text_space + pc - core_text_sect->vma; if (i386_iscall (instructp)) { DBG (CALLDEBUG, - printf ("[findcall]\t0x%lx:call", - (unsigned long) (instructp - (unsigned char *) delta))); + printf ("[findcall]\t0x%lx:call", (unsigned long) pc)); /* * regular pc relative addressing * check that this is the address of * a function. */ - destpc = ((bfd_vma) bfd_get_32 (core_bfd, instructp + 1) - + (bfd_vma) instructp - (bfd_vma) delta + 5); + destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5; if (destpc >= s_lowpc && destpc <= s_highpc) { child = sym_lookup (&symtab, destpc); |