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/hist.h | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'gprof/hist.h') diff --git a/gprof/hist.h b/gprof/hist.h index 96624c6..4ed6958 100644 --- a/gprof/hist.h +++ b/gprof/hist.h @@ -21,20 +21,37 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. #ifndef hist_h #define hist_h -extern bfd_vma s_lowpc; /* Lowpc from the profile file. */ -extern bfd_vma s_highpc; /* Highpc from the profile file. */ -extern bfd_vma lowpc, highpc; /* Range profiled, in UNIT's. */ -extern unsigned int hist_num_bins; /* Number of histogram bins. */ -extern int *hist_sample; /* Code histogram. */ +typedef struct histogram +{ + bfd_vma lowpc; + bfd_vma highpc; + unsigned int num_bins; + int *sample; /* Histogram samples (shorts in the file!). */ +} histogram; + +histogram *histograms; +unsigned num_histograms; /* Scale factor converting samples to pc values: each sample covers HIST_SCALE bytes. */ extern double hist_scale; - extern void hist_read_rec (FILE *, const char *); extern void hist_write_hist (FILE *, const char *); extern void hist_assign_samples (void); extern void hist_print (void); +/* Checks if ADDRESS is within the range of addresses for which + we have histogram data. Returns 1 if so and 0 otherwise. */ +extern int hist_check_address (unsigned address); + +/* Given a range of addresses for a symbol, find a histogram record + that intersects with this range, and clips the range to that + histogram record, modifying *P_LOWPC and *P_HIGHPC. + + If no intersection is found, *P_LOWPC and *P_HIGHPC will be set to + one unspecified value. If more that one intersection is found, + an error is emitted. */ +extern void hist_clip_symbol_address (bfd_vma *p_lowpc, bfd_vma *p_highpc); + #endif /* hist_h */ -- cgit v1.1