diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2007-04-10 07:57:31 +0000 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2007-04-10 07:57:31 +0000 |
| commit | b3296dc54c51d28ada4c97aca7f55a4abfe09d9a (patch) | |
| tree | 574e097a5069021c4cb996d8012d8830e4ca1c0b /gprof/mips.c | |
| parent | 8e77c9de92cec383d9fa3b1f8cf10e4840174396 (diff) | |
| download | gdb-b3296dc54c51d28ada4c97aca7f55a4abfe09d9a.zip gdb-b3296dc54c51d28ada4c97aca7f55a4abfe09d9a.tar.gz gdb-b3296dc54c51d28ada4c97aca7f55a4abfe09d9a.tar.bz2 | |
* 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.
Diffstat (limited to 'gprof/mips.c')
| -rw-r--r-- | gprof/mips.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gprof/mips.c b/gprof/mips.c index 96d2707..7a7344d 100644 --- a/gprof/mips.c +++ b/gprof/mips.c @@ -56,24 +56,13 @@ mips_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) indirect_child.cg.cyc.head = &indirect_child; } - if (!core_text_space) - { - return; - } - if (p_lowpc < s_lowpc) - { - p_lowpc = s_lowpc; - } - if (p_highpc > s_highpc) - { - p_highpc = s_highpc; - } DBG (CALLDEBUG, printf (_("[find_call] %s: 0x%lx to 0x%lx\n"), parent->name, (unsigned long) p_lowpc, (unsigned long) p_highpc)); for (pc = p_lowpc; pc < p_highpc; pc += 4) { - op = bfd_get_32 (core_bfd, &((char *)core_text_space)[pc - s_lowpc]); + op = bfd_get_32 (core_bfd, ((unsigned char *)core_text_space + + pc - core_text_sect->vma)); if ((op & 0xfc000000) == 0x0c000000) { /* This is a "jal" instruction. Check that the destination @@ -82,7 +71,7 @@ mips_find_call (Sym *parent, bfd_vma p_lowpc, bfd_vma p_highpc) printf (_("[find_call] 0x%lx: jal"), (unsigned long) pc)); offset = (op & 0x03ffffff) << 2; dest_pc = (pc & ~(bfd_vma) 0xfffffff) | offset; - if (dest_pc >= s_lowpc && dest_pc <= s_highpc) + if (hist_check_address (dest_pc)) { child = sym_lookup (&symtab, dest_pc); DBG (CALLDEBUG, |