* configure.in (WIN32LDFLAGS): Rename to SHARED_LDFLAGS.

[deliverable/binutils-gdb.git] / gprof / sym_ids.c

diff --git a/gprof/sym_ids.c b/gprof/sym_ids.c
index f388d111412766ed9a9ab8346c802624dd6edf53..492e825136f43fcab67dfde256dbf8a82dc78542 100644 (file)
--- a/gprof/sym_ids.c
+++ b/gprof/sym_ids.c
@@ -1,12 +1,12 @@
 /* sym_ids.c
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 \f
 #include "libiberty.h"
 #include "safe-ctype.h"
@@ -27,13 +27,14 @@
 #include "symtab.h"
 #include "cg_arcs.h"
 #include "sym_ids.h"
+#include "corefile.h"
 
-struct sym_id
+static struct sym_id
   {
     struct sym_id *next;
     char *spec;                        /* Parsing modifies this.  */
     Table_Id which_table;
-    boolean has_right;
+    bfd_boolean has_right;
 
     struct match
       {
@@ -46,10 +47,20 @@ struct sym_id
   }
  *id_list;
 
+static void parse_spec
+  (char *, Sym *);
+static void parse_id
+  (struct sym_id *);
+static bfd_boolean match
+  (Sym *, Sym *);
+static void extend_match
+  (struct match *, Sym *, Sym_Table *, bfd_boolean);
+
+
 Sym_Table syms[NUM_TABLES];
 
 #ifdef DEBUG
-const char *table_name[] =
+static const char *table_name[] =
 {
   "INCL_GRAPH", "EXCL_GRAPH",
   "INCL_ARCS", "EXCL_ARCS",
@@ -74,8 +85,7 @@ static Source_File non_existent_file =
 
 
 void
-DEFUN (sym_id_add, (spec, which_table),
-       const char *spec AND Table_Id which_table)
+sym_id_add (const char *spec, Table_Id which_table)
 {
   struct sym_id *id;
   int len = strlen (spec);
@@ -103,7 +113,7 @@ DEFUN (sym_id_add, (spec, which_table),
    FILENAME not containing a dot can be specified by FILENAME.  */
 
 static void
-DEFUN (parse_spec, (spec, sym), char *spec AND Sym * sym)
+parse_spec (char *spec, Sym *sym)
 {
   char *colon;
 
@@ -158,7 +168,7 @@ DEFUN (parse_spec, (spec, sym), char *spec AND Sym * sym)
    by parse_spec().  */
 
 static void
-DEFUN (parse_id, (id), struct sym_id *id)
+parse_id (struct sym_id *id)
 {
   char *slash;
 
@@ -169,7 +179,7 @@ DEFUN (parse_id, (id), struct sym_id *id)
     {
       parse_spec (slash + 1, &id->right.sym);
       *slash = '\0';
-      id->has_right = true;
+      id->has_right = TRUE;
     }
   parse_spec (id->spec, &id->left.sym);
 
@@ -206,21 +216,27 @@ DEFUN (parse_id, (id), struct sym_id *id)
 
 /* Return TRUE iff PATTERN matches SYM.  */
 
-static boolean
-DEFUN (match, (pattern, sym), Sym * pattern AND Sym * sym)
+static bfd_boolean
+match (Sym *pattern, Sym *sym)
 {
-  return (pattern->file ? pattern->file == sym->file : true)
-    && (pattern->line_num ? pattern->line_num == sym->line_num : true)
-    && (pattern->name
-       ? strcmp (pattern->name,
-                 sym->name+(discard_underscores && sym->name[0] == '_')) == 0
-       : true);
+  if (pattern->file && pattern->file != sym->file)
+    return FALSE;
+  if (pattern->line_num && pattern->line_num != sym->line_num)
+    return FALSE;
+  if (pattern->name)
+    {
+      const char *sym_name = sym->name;
+      if (*sym_name && bfd_get_symbol_leading_char (core_bfd) == *sym_name)
+       sym_name++;
+      if (strcmp (pattern->name, sym_name) != 0)
+       return FALSE;
+    }
+  return TRUE;
 }
 
 
 static void
-DEFUN (extend_match, (m, sym, tab, second_pass),
-     struct match *m AND Sym * sym AND Sym_Table * tab AND boolean second_pass)
+extend_match (struct match *m, Sym *sym, Sym_Table *tab, bfd_boolean second_pass)
 {
   if (m->prev_match != sym - 1)
     {
@@ -255,7 +271,7 @@ DEFUN (extend_match, (m, sym, tab, second_pass),
    requests---you get what you ask for!  */
 
 void
-DEFUN_VOID (sym_id_parse)
+sym_id_parse ()
 {
   Sym *sym, *left, *right;
   struct sym_id *id;
@@ -271,10 +287,10 @@ DEFUN_VOID (sym_id_parse)
       for (id = id_list; id; id = id->next)
        {
          if (match (&id->left.sym, sym))
-           extend_match (&id->left, sym, &syms[id->which_table], false);
+           extend_match (&id->left, sym, &syms[id->which_table], FALSE);
 
          if (id->has_right && match (&id->right.sym, sym))
-           extend_match (&id->right, sym, &right_ids, false);
+           extend_match (&id->right, sym, &right_ids, FALSE);
        }
     }
 
@@ -302,10 +318,10 @@ DEFUN_VOID (sym_id_parse)
       for (id = id_list; id; id = id->next)
        {
          if (match (&id->left.sym, sym))
-           extend_match (&id->left, sym, &syms[id->which_table], true);
+           extend_match (&id->left, sym, &syms[id->which_table], TRUE);
 
          if (id->has_right && match (&id->right.sym, sym))
-           extend_match (&id->right, sym, &right_ids, true);
+           extend_match (&id->right, sym, &right_ids, TRUE);
        }
     }
 
@@ -353,18 +369,17 @@ DEFUN_VOID (sym_id_parse)
    time requesting -k a/b.  Fortunately, those symbol tables don't get
    very big (the user has to type them!), so a linear search is probably
    tolerable.  */
-boolean
-DEFUN (sym_id_arc_is_present, (symtab, from, to),
-       Sym_Table * symtab AND Sym * from AND Sym * to)
+bfd_boolean
+sym_id_arc_is_present (Sym_Table *sym_tab, Sym *from, Sym *to)
 {
   Sym *sym;
 
-  for (sym = symtab->base; sym < symtab->limit; ++sym)
+  for (sym = sym_tab->base; sym < sym_tab->limit; ++sym)
     {
       if (from->addr >= sym->addr && from->addr <= sym->end_addr
          && arc_lookup (sym, to))
-       return true;
+       return TRUE;
     }
 
-  return false;
+  return FALSE;
 }