*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / macrotab.c

diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 56ee2a4c2844d3f8940848b1878d208fa208dbc1..93651ab39aad2defef3807ab7f2e89b193122a13 100644 (file)
--- a/gdb/macrotab.c
+++ b/gdb/macrotab.c
@@ -1,12 +1,12 @@
 /* C preprocessor macro tables for GDB.
 /* C preprocessor macro tables for GDB.

-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    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
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "gdb_obstack.h"
 
 #include "defs.h"
 #include "gdb_obstack.h"


@@ -48,6 +46,10 @@ struct macro_table
      #inclusion tree; everything else is #included from here.  */
   struct macro_source_file *main_source;
 
      #inclusion tree; everything else is #included from here.  */
   struct macro_source_file *main_source;
 

+  /* True if macros in this table can be redefined without issuing an
+     error.  */
+  int redef_ok;
+

   /* The table of macro definitions.  This is a splay tree (an ordered
      binary tree that stays balanced, effectively), sorted by macro
      name.  Where a macro gets defined more than once (presumably with
   /* The table of macro definitions.  This is a splay tree (an ordered
      binary tree that stays balanced, effectively), sorted by macro
      name.  Where a macro gets defined more than once (presumably with


@@ -89,8 +91,14 @@ macro_alloc (int size, struct macro_table *t)
 static void
 macro_free (void *object, struct macro_table *t)
 {
 static void
 macro_free (void *object, struct macro_table *t)
 {

-  gdb_assert (! t->obstack);
-  xfree (object);
+  if (t->obstack)
+    /* There are cases where we need to remove entries from a macro
+       table, even when reading debugging information.  This should be
+       rare, and there's no easy way to free arbitrary data from an
+       obstack, so we just leak it.  */
+    ;
+  else
+    xfree (object);

 }
 
 
 }
 
 


@@ -105,6 +113,7 @@ macro_bcache (struct macro_table *t, const void *addr, int len)
   else
     {
       void *copy = xmalloc (len);
   else
     {
       void *copy = xmalloc (len);

+

       memcpy (copy, addr, len);
       return copy;
     }
       memcpy (copy, addr, len);
       return copy;
     }


@@ -122,12 +131,18 @@ macro_bcache_str (struct macro_table *t, const char *s)
 
 
 /* Free a possibly bcached object OBJ.  That is, if the macro table T
 
 
 /* Free a possibly bcached object OBJ.  That is, if the macro table T

-   has a bcache, it's an error; otherwise, xfree OBJ.  */
+   has a bcache, do nothing; otherwise, xfree OBJ.  */

 static void
 macro_bcache_free (struct macro_table *t, void *obj)
 {
 static void
 macro_bcache_free (struct macro_table *t, void *obj)
 {

-  gdb_assert (! t->bcache);
-  xfree (obj);
+  if (t->bcache)
+    /* There are cases where we need to remove entries from a macro
+       table, even when reading debugging information.  This should be
+       rare, and there's no easy way to free data from a bcache, so we
+       just leak it.  */
+    ;
+  else
+    xfree (obj);

 }
 
 
 }
 
 


@@ -302,6 +317,7 @@ key_compare (struct macro_key *key,
              const char *name, struct macro_source_file *file, int line)
 {
   int names = strcmp (key->name, name);
              const char *name, struct macro_source_file *file, int line)
 {
   int names = strcmp (key->name, name);

+

   if (names)
     return names;
 
   if (names)
     return names;
 


@@ -417,6 +433,14 @@ macro_main (struct macro_table *t)
 }
 
 
 }
 
 

+void
+macro_allow_redefinitions (struct macro_table *t)
+{
+  gdb_assert (! t->obstack);
+  t->redef_ok = 1;
+}
+
+

 struct macro_source_file *
 macro_include (struct macro_source_file *source,
                int line,
 struct macro_source_file *
 macro_include (struct macro_source_file *source,
                int line,


@@ -445,7 +469,7 @@ macro_include (struct macro_source_file *source,
 
          First, squawk.  */
       complaint (&symfile_complaints,
 
          First, squawk.  */
       complaint (&symfile_complaints,

-                "both `%s' and `%s' allegedly #included at %s:%d", included,
+                _("both `%s' and `%s' allegedly #included at %s:%d"), included,

                 (*link)->filename, source->filename, line);
 
       /* Now, choose a new, unoccupied line number for this
                 (*link)->filename, source->filename, line);
 
       /* Now, choose a new, unoccupied line number for this


@@ -704,7 +728,7 @@ check_for_redefinition (struct macro_source_file *source, int line,
       if (! same)
         {
          complaint (&symfile_complaints,
       if (! same)
         {
          complaint (&symfile_complaints,

-                    "macro `%s' redefined at %s:%d; original definition at %s:%d",
+                    _("macro `%s' redefined at %s:%d; original definition at %s:%d"),

                     name, source->filename, line,
                     found_key->start_file->filename, found_key->start_line);
         }
                     name, source->filename, line,
                     found_key->start_file->filename, found_key->start_line);
         }


@@ -721,13 +745,14 @@ macro_define_object (struct macro_source_file *source, int line,
                      const char *name, const char *replacement)
 {
   struct macro_table *t = source->table;
                      const char *name, const char *replacement)
 {
   struct macro_table *t = source->table;

-  struct macro_key *k;
+  struct macro_key *k = NULL;

   struct macro_definition *d;
 
   struct macro_definition *d;
 

-  k = check_for_redefinition (source, line, 
-                              name, macro_object_like,
-                              0, 0,
-                              replacement);
+  if (! t->redef_ok)
+    k = check_for_redefinition (source, line, 
+                               name, macro_object_like,
+                               0, 0,
+                               replacement);

 
   /* If we're redefining a symbol, and the existing key would be
      identical to our new key, then the splay_tree_insert function
 
   /* If we're redefining a symbol, and the existing key would be
      identical to our new key, then the splay_tree_insert function


@@ -754,13 +779,14 @@ macro_define_function (struct macro_source_file *source, int line,
                        const char *replacement)
 {
   struct macro_table *t = source->table;
                        const char *replacement)
 {
   struct macro_table *t = source->table;

-  struct macro_key *k;
+  struct macro_key *k = NULL;

   struct macro_definition *d;
 
   struct macro_definition *d;
 

-  k = check_for_redefinition (source, line,
-                              name, macro_function_like,
-                              argc, argv,
-                              replacement);
+  if (! t->redef_ok)
+    k = check_for_redefinition (source, line,
+                               name, macro_function_like,
+                               argc, argv,
+                               replacement);

 
   /* See comments about duplicate keys in macro_define_object.  */
   if (k && ! key_compare (k, name, source, line))
 
   /* See comments about duplicate keys in macro_define_object.  */
   if (k && ! key_compare (k, name, source, line))


@@ -783,25 +809,39 @@ macro_undef (struct macro_source_file *source, int line,
 
   if (n)
     {
 
   if (n)
     {

-      /* This function is the only place a macro's end-of-scope
-         location gets set to anything other than "end of the
-         compilation unit" (i.e., end_file is zero).  So if this macro
-         already has its end-of-scope set, then we're probably seeing
-         a second #undefinition for the same #definition.  */

       struct macro_key *key = (struct macro_key *) n->key;
 
       struct macro_key *key = (struct macro_key *) n->key;
 

-      if (key->end_file)
+      /* If we're removing a definition at exactly the same point that
+         we defined it, then just delete the entry altogether.  GCC
+         4.1.2 will generate DWARF that says to do this if you pass it
+         arguments like '-DFOO -UFOO -DFOO=2'.  */
+      if (source == key->start_file
+          && line == key->start_line)
+        splay_tree_remove (source->table->definitions, n->key);
+
+      else

         {
         {

-         complaint (&symfile_complaints,
-                    "macro '%s' is #undefined twice, at %s:%d and %s:%d", name,
-                    source->filename, line, key->end_file->filename,
-                    key->end_line);
-        }
+          /* This function is the only place a macro's end-of-scope
+             location gets set to anything other than "end of the
+             compilation unit" (i.e., end_file is zero).  So if this
+             macro already has its end-of-scope set, then we're
+             probably seeing a second #undefinition for the same
+             #definition.  */
+          if (key->end_file)
+            {
+              complaint (&symfile_complaints,
+                         _("macro '%s' is #undefined twice,"
+                           " at %s:%d and %s:%d"),
+                         name,
+                         source->filename, line,
+                         key->end_file->filename, key->end_line);
+            }

 
 

-      /* Whatever the case, wipe out the old ending point, and 
-         make this the ending point.  */
-      key->end_file = source;
-      key->end_line = line;
+          /* Whether or not we've seen a prior #undefinition, wipe out
+             the old ending point, and make this the ending point.  */
+          key->end_file = source;
+          key->end_line = line;
+        }

     }
   else
     {
     }
   else
     {


@@ -810,7 +850,7 @@ macro_undef (struct macro_source_file *source, int line,
          ignore it too.  */
 #if 0
       complaint (&symfile_complaints,
          ignore it too.  */
 #if 0
       complaint (&symfile_complaints,

-                "no definition for macro `%s' in scope to #undef at %s:%d",
+                _("no definition for macro `%s' in scope to #undef at %s:%d"),

                 name, source->filename, line);
 #endif
     }
                 name, source->filename, line);
 #endif
     }


@@ -841,6 +881,7 @@ macro_definition_location (struct macro_source_file *source,
   if (n)
     {
       struct macro_key *key = (struct macro_key *) n->key;
   if (n)
     {
       struct macro_key *key = (struct macro_key *) n->key;

+

       *definition_line = key->start_line;
       return key->start_file;
     }
       *definition_line = key->start_line;
       return key->start_file;
     }


@@ -849,6 +890,77 @@ macro_definition_location (struct macro_source_file *source,
 }
 
 
 }
 
 

+/* The type for callback data for iterating the splay tree in
+   macro_for_each and macro_for_each_in_scope.  Only the latter uses
+   the FILE and LINE fields.  */
+struct macro_for_each_data
+{
+  macro_callback_fn fn;
+  void *user_data;
+  struct macro_source_file *file;
+  int line;
+};
+
+/* Helper function for macro_for_each.  */
+static int
+foreach_macro (splay_tree_node node, void *arg)
+{
+  struct macro_for_each_data *datum = (struct macro_for_each_data *) arg;
+  struct macro_key *key = (struct macro_key *) node->key;
+  struct macro_definition *def = (struct macro_definition *) node->value;
+
+  (*datum->fn) (key->name, def, datum->user_data);
+  return 0;
+}
+
+/* Call FN for every macro in TABLE.  */
+void
+macro_for_each (struct macro_table *table, macro_callback_fn fn,
+               void *user_data)
+{
+  struct macro_for_each_data datum;
+
+  datum.fn = fn;
+  datum.user_data = user_data;
+  datum.file = NULL;
+  datum.line = 0;
+  splay_tree_foreach (table->definitions, foreach_macro, &datum);
+}
+
+static int
+foreach_macro_in_scope (splay_tree_node node, void *info)
+{
+  struct macro_for_each_data *datum = (struct macro_for_each_data *) info;
+  struct macro_key *key = (struct macro_key *) node->key;
+  struct macro_definition *def = (struct macro_definition *) node->value;
+
+  /* See if this macro is defined before the passed-in line, and
+     extends past that line.  */
+  if (compare_locations (key->start_file, key->start_line,
+                        datum->file, datum->line) < 0
+      && (!key->end_file
+         || compare_locations (key->end_file, key->end_line,
+                               datum->file, datum->line) >= 0))
+    (*datum->fn) (key->name, def, datum->user_data);
+  return 0;
+}
+
+/* Call FN for every macro is visible in SCOPE.  */
+void
+macro_for_each_in_scope (struct macro_source_file *file, int line,
+                        macro_callback_fn fn, void *user_data)
+{
+  struct macro_for_each_data datum;
+
+  datum.fn = fn;
+  datum.user_data = user_data;
+  datum.file = file;
+  datum.line = line;
+  splay_tree_foreach (file->table->definitions,
+                     foreach_macro_in_scope, &datum);
+}
+
+

 \f
 /* Creating and freeing macro tables.  */
 
 \f
 /* Creating and freeing macro tables.  */
 


@@ -869,6 +981,7 @@ new_macro_table (struct obstack *obstack,
   t->obstack = obstack;
   t->bcache = b;
   t->main_source = NULL;
   t->obstack = obstack;
   t->bcache = b;
   t->main_source = NULL;

+  t->redef_ok = 0;

   t->definitions = (splay_tree_new_with_allocator
                     (macro_tree_compare,
                      ((splay_tree_delete_key_fn) macro_tree_delete_key),
   t->definitions = (splay_tree_new_with_allocator
                     (macro_tree_compare,
                      ((splay_tree_delete_key_fn) macro_tree_delete_key),