From b3296dc54c51d28ada4c97aca7f55a4abfe09d9a Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Tue, 10 Apr 2007 07:57:31 +0000 Subject: * hist.h (struct histogram) (histograms, num_histograms): New. * hist.c (find_histogram, find_histogram_for_pc) (read_histogram_header): New. (s_lowpc, s_highpc, lowpc, highpc, hist_num_bins) (hist_sample): Remove. (hist_read_rec): Use the above, and handle multiple histogram records with disjoint address ranges. (hist_write_hist): Support several histogram records. (scale_and_align_entries): Adjust for multiple histograms. (hist_assign_samples_1): New. (hist_assign_samples): Use the above. (hist_clip_symbol_address): New. * hist.h (hist_check_address) (hist_clip_symbol_address): Declare. * gmon_io.c (gmon_out_read, gmon_out_write): Adjust handling of legacy format for multiple histogram changes. * corefile.c (find_call): Check for core_text_space and clip symbol address range here. * vax.c (vax_find_call): Don't check for core_text_space, or clip the symbol's address range here. Use hist_check_address to check call's target address. * sparc.c: Likewise. * tahoe.c: Likewise. * i386.c: Likewise. * mips.c: Likewise. Also use core_text_sect->vma as the base address for code accesses, just like other machine-specific routines do. * gprof.texi: Adjust for the new logic. --- gprof/tahoe.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gprof/tahoe.c') diff --git a/gprof/tahoe.c b/gprof/tahoe.c index de94db6..c1d9c42 100644 --- a/gprof/tahoe.c +++ b/gprof/tahoe.c @@ -235,18 +235,6 @@ tahoe_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma 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, (unsigned long) p_lowpc, (unsigned long) p_highpc)); @@ -307,7 +295,7 @@ tahoe_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) * a function. */ destpc = pc + tahoe_offset (instructp + length); - if (destpc >= s_lowpc && destpc <= s_highpc) + if (hist_check_address (destpc)) { child = sym_lookup (&symtab, destpc); DBG (CALLDEBUG, -- cgit v1.1