X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gprof%2Futils.c;h=4fc2db6038e94c91965a0120c37dbd5190503489;hb=fc75c28ba1ea7353fb6e1e5904c5703a48504b67;hp=9549a8d90576b2bbfa40a5644a9c2be20dfcc105;hpb=5489fcc3d9dbb1f529dddb19b615e23d8ed59dc7;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/utils.c b/gprof/utils.c index 9549a8d905..4fc2db6038 100644 --- a/gprof/utils.c +++ b/gprof/utils.c @@ -1,90 +1,119 @@ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 1993, 2001 + * The 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -#include #include "gprof.h" -#include "cg_arcs.h" +#include "demangle.h" +#include "search_list.h" +#include "source.h" #include "symtab.h" +#include "cg_arcs.h" +#include "utils.h" +#include "corefile.h" /* * Print name of symbol. Return number of characters printed. */ int -DEFUN(print_name_only, (self), Sym *self) +print_name_only (Sym *self) { - const char *name = self->name; - const char *filename; - char *demangled = 0; - char buf[PATH_MAX]; - int size = 0; + const char *name = self->name; + const char *filename; + char *demangled = 0; + char buf[PATH_MAX]; + int size = 0; - if (name) { - if (!bsd_style_output) { - if (name[0] == '_' && name[1] && discard_underscores) { - name++; - } /* if */ - demangled = cplus_demangle(name, DMGL_ANSI|DMGL_PARAMS); - if (demangled) { - name = demangled; - } /* if */ - } /* if */ - printf("%s", name); - size = strlen(name); - if (line_granularity && self->file) { - filename = self->file->name; - if (!print_path) { - filename = strrchr(filename, '/'); - if (filename) { - ++filename; - } else { - filename = self->file->name; - } /* if */ - } /* if */ - sprintf(buf, " (%s:%d)", filename, self->line_num); - printf(buf); - size += strlen(buf); - } /* if */ - if (demangled) { - free(demangled); - } /* if */ - DBG(DFNDEBUG, printf("{%d} ", self->cg.top_order)); - DBG(PROPDEBUG, printf("%4.0f%% ", 100.0 * self->cg.prop.fract)); - } /* if */ - return size; -} /* print_name_only */ + if (name) + { + if (!bsd_style_output && demangle) + { + demangled = bfd_demangle (core_bfd, name, DMGL_ANSI | DMGL_PARAMS); + if (demangled) + name = demangled; + } + printf ("%s", name); + size = strlen (name); + if ((line_granularity || inline_file_names) && self->file) + { + filename = self->file->name; + if (!print_path) + { + filename = strrchr (filename, '/'); + if (filename) + { + ++filename; + } + else + { + filename = self->file->name; + } + } + if (line_granularity) + { + sprintf (buf, " (%s:%d @ %lx)", filename, self->line_num, + (unsigned long) self->addr); + } + else + { + sprintf (buf, " (%s:%d)", filename, self->line_num); + } + printf ("%s", buf); + size += strlen (buf); + } + if (demangled) + { + free (demangled); + } + DBG (DFNDEBUG, printf ("{%d} ", self->cg.top_order)); + DBG (PROPDEBUG, printf ("%4.0f%% ", 100.0 * self->cg.prop.fract)); + } + return size; +} void -DEFUN(print_name, (self), Sym *self) +print_name (Sym *self) { - print_name_only(self); - - if (self->cg.cyc.num != 0) { - printf(" ", self->cg.cyc.num); - } /* if */ - if (self->cg.index != 0) { - if (self->cg.print_flag) { - printf(" [%d]", self->cg.index); - } else { - printf(" (%d)", self->cg.index); - } /* if */ - } /* if */ -} /* print_name */ + print_name_only (self); - /*** end of utils.c ***/ + if (self->cg.cyc.num != 0) + { + printf (_(" "), self->cg.cyc.num); + } + if (self->cg.index != 0) + { + if (self->cg.print_flag) + { + printf (" [%d]", self->cg.index); + } + else + { + printf (" (%d)", self->cg.index); + } + } +}