diff options
Diffstat (limited to 'gprof')
| -rw-r--r-- | gprof/ChangeLog | 9 | ||||
| -rw-r--r-- | gprof/Makefile.am | 7 | ||||
| -rw-r--r-- | gprof/Makefile.in | 11 | ||||
| -rw-r--r-- | gprof/corefile.c | 7 | ||||
| -rw-r--r-- | gprof/mips.c | 102 |
5 files changed, 131 insertions, 5 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 8193940fbf..d9223c923d 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,12 @@ +2002-01-26 Jason Thorpe <thorpej@wasabisystems.com> + + * mips.c: New file. + * Makefile.am (sources): Add mips.c. + (mips.o): New rule. + * Makefile.in: Regenerate. + * corefile.c: Update copyright years. + (find_call): Call mips_find_call for bfd_arch_mips. + 2002-01-26 Nick Clifton <nickc@cambridge.redhat.com> * po/fr.po: Updated version. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index b0b95c7132..4401e17530 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = gprof sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ cg_print.c corefile.c gmon_io.c gprof.c hertz.c hist.c source.c \ search_list.c symtab.c sym_ids.c utils.c \ - i386.c alpha.c vax.c tahoe.c sparc.c + i386.c alpha.c vax.c tahoe.c sparc.c mips.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS) gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLLIBS) @@ -220,6 +220,11 @@ sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ $(INCDIR)/symcat.h source.h search_list.h corefile.h \ hist.h +mips.o: mips.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + $(INCDIR)/symcat.h source.h search_list.h corefile.h \ + hist.h flat_bl.o: flat_bl.c bsd_callg_bl.o: bsd_callg_bl.c fsf_callg_bl.o: fsf_callg_bl.c diff --git a/gprof/Makefile.in b/gprof/Makefile.in index c8961fcaa3..f2fcd22301 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -123,7 +123,7 @@ bin_PROGRAMS = gprof sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ cg_print.c corefile.c gmon_io.c gprof.c hertz.c hist.c source.c \ search_list.c symtab.c sym_ids.c utils.c \ - i386.c alpha.c vax.c tahoe.c sparc.c + i386.c alpha.c vax.c tahoe.c sparc.c mips.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS) @@ -167,8 +167,8 @@ cg_arcs.$(OBJEXT) cg_dfn.$(OBJEXT) cg_print.$(OBJEXT) \ corefile.$(OBJEXT) gmon_io.$(OBJEXT) gprof.$(OBJEXT) hertz.$(OBJEXT) \ hist.$(OBJEXT) source.$(OBJEXT) search_list.$(OBJEXT) symtab.$(OBJEXT) \ sym_ids.$(OBJEXT) utils.$(OBJEXT) i386.$(OBJEXT) alpha.$(OBJEXT) \ -vax.$(OBJEXT) tahoe.$(OBJEXT) sparc.$(OBJEXT) flat_bl.$(OBJEXT) \ -bsd_callg_bl.$(OBJEXT) fsf_callg_bl.$(OBJEXT) +vax.$(OBJEXT) tahoe.$(OBJEXT) sparc.$(OBJEXT) mips.$(OBJEXT) \ +flat_bl.$(OBJEXT) bsd_callg_bl.$(OBJEXT) fsf_callg_bl.$(OBJEXT) gprof_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -883,6 +883,11 @@ sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ $(INCDIR)/symcat.h source.h search_list.h corefile.h \ hist.h +mips.o: mips.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + $(INCDIR)/symcat.h source.h search_list.h corefile.h \ + hist.h flat_bl.o: flat_bl.c bsd_callg_bl.o: bsd_callg_bl.c fsf_callg_bl.o: fsf_callg_bl.c diff --git a/gprof/corefile.c b/gprof/corefile.c index 82db0f685e..55515ecf66 100644 --- a/gprof/corefile.c +++ b/gprof/corefile.c @@ -1,6 +1,6 @@ /* corefile.c - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -48,6 +48,7 @@ extern void alpha_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); extern void vax_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); extern void tahoe_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); extern void sparc_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); +extern void mips_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); static void DEFUN (read_function_mappings, (filename), const char *filename) @@ -261,6 +262,10 @@ DEFUN (find_call, (parent, p_lowpc, p_highpc), tahoe_find_call (parent, p_lowpc, p_highpc); break; + case bfd_arch_mips: + mips_find_call (parent, p_lowpc, p_highpc); + break; + default: fprintf (stderr, _("%s: -c not supported on architecture %s\n"), whoami, bfd_printable_name(core_bfd)); diff --git a/gprof/mips.c b/gprof/mips.c new file mode 100644 index 0000000000..1d050527ed --- /dev/null +++ b/gprof/mips.c @@ -0,0 +1,102 @@ +/* + * Copyright (c) 1983, 1998 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that: (1) source distributions retain this entire copyright + * notice and comment, and (2) distributions including binaries display + * the following acknowledgement: ``This product includes software + * developed by the University of California, Berkeley and its contributors'' + * in the documentation or other materials provided with the distribution + * and in all advertising materials mentioning features or use of this + * software. Neither the name of the University nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ +#include "gprof.h" +#include "cg_arcs.h" +#include "corefile.h" +#include "hist.h" +#include "symtab.h" + +static Sym indirect_child; + +void mips_find_call PARAMS ((Sym *, bfd_vma, bfd_vma)); + +void +mips_find_call (parent, p_lowpc, p_highpc) + Sym *parent; + bfd_vma p_lowpc; + bfd_vma p_highpc; +{ + bfd_vma pc, dest_pc; + unsigned int op; + int offset; + Sym *child; + static bool inited = FALSE; + + if (!inited) + { + inited = TRUE; + sym_init (&indirect_child); + indirect_child.name = _("<indirect child>"); + indirect_child.cg.prop.fract = 1.0; + 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]); + if ((op & 0xfc000000) == 0x0c000000) + { + /* This is a "jal" instruction. Check that the destination + is the address of a function. */ + DBG (CALLDEBUG, + printf (_("[find_call] 0x%lx: jal"), (unsigned long) pc)); + offset = (op & 0x03ffffff) << 2; + dest_pc = (pc & ~0xfffffff) | offset; + if (dest_pc >= s_lowpc && dest_pc <= s_highpc) + { + child = sym_lookup (&symtab, dest_pc); + DBG (CALLDEBUG, + printf (" 0x%lx\t; name=%s, addr=0x%lx", + (unsigned long) dest_pc, child->name, + (unsigned long) child->addr)); + if (child->addr == dest_pc) + { + DBG (CALLDEBUG, printf ("\n")); + /* a hit: */ + arc_add (parent, child, (unsigned long) 0); + continue; + } + } + /* Something funny going on. */ + DBG (CALLDEBUG, printf ("\tbut it's a botch\n")); + } + else if ((op & 0xfc00f83f) == 0x0000f809) + { + /* This is a "jalr" instruction (indirect call). */ + DBG (CALLDEBUG, + printf (_("[find_call] 0x%lx: jalr\n"), (unsigned long) pc)); + arc_add (parent, &indirect_child, (unsigned long) 0); + } + } +} |
