daily update

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

diff --git a/gdb/macrotab.h b/gdb/macrotab.h
index a10351a23b9ba2265c2f335c2e2b10ff367f15ae..aca7fd49b6c190b4d09a260c73b412a4ea8d05cf 100644 (file)
--- a/gdb/macrotab.h
+++ b/gdb/macrotab.h
@@ -1,6 +1,5 @@
 /* Interface to C preprocessor macro tables for GDB.
 /* Interface to C preprocessor macro tables for GDB.

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

    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.


@@ -126,7 +125,9 @@ struct macro_source_file
      a part of.  */
   struct macro_table *table;
 
      a part of.  */
   struct macro_table *table;
 

-  /* A source file --- possibly a header file.  */
+  /* A source file --- possibly a header file.  This filename is relative to
+     the compilation directory (table->comp_dir), it exactly matches the
+     symtab->filename content.  */

   const char *filename;
 
   /* The location we were #included from, or zero if we are the
   const char *filename;
 
   /* The location we were #included from, or zero if we are the


@@ -153,7 +154,8 @@ struct macro_source_file
    xmalloc if OBSTACK is zero.  Use BCACHE to store all macro names,
    arguments, definitions, and anything else that might be the same
    amongst compilation units in an executable file; if BCACHE is zero,
    xmalloc if OBSTACK is zero.  Use BCACHE to store all macro names,
    arguments, definitions, and anything else that might be the same
    amongst compilation units in an executable file; if BCACHE is zero,

-   don't cache these things.
+   don't cache these things.  COMP_DIR optionally contains the compilation
+   directory of all files for this macro table.

 
    Note that, if either OBSTACK or BCACHE are non-zero, then removing
    information from the table may leak memory.  Neither obstacks nor
 
    Note that, if either OBSTACK or BCACHE are non-zero, then removing
    information from the table may leak memory.  Neither obstacks nor


@@ -165,7 +167,8 @@ struct macro_source_file
    the same source location (although 'gcc -DFOO -UFOO -DFOO=2' does
    do that in GCC 4.1.2.).  */
 struct macro_table *new_macro_table (struct obstack *obstack,
    the same source location (although 'gcc -DFOO -UFOO -DFOO=2' does
    do that in GCC 4.1.2.).  */
 struct macro_table *new_macro_table (struct obstack *obstack,

-                                     struct bcache *bcache);
+                                     struct bcache *bcache,
+                                    const char *comp_dir);

 
 
 /* Free TABLE, and any macro definitions, source file structures,
 
 
 /* Free TABLE, and any macro definitions, source file structures,


@@ -213,6 +216,10 @@ struct macro_source_file *macro_include (struct macro_source_file *source,
                                          int line,
                                          const char *included);
 
                                          int line,
                                          const char *included);
 

+/* Define any special macros, like __FILE__ or __LINE__.  This should
+   be called once, on the main source file.  */
+
+void macro_define_special (struct macro_table *table);

 
 /* Find any source file structure for a file named NAME, either
    included into SOURCE, or SOURCE itself.  Return zero if we have
 
 /* Find any source file structure for a file named NAME, either
    included into SOURCE, or SOURCE itself.  Return zero if we have


@@ -262,6 +269,17 @@ enum macro_kind
   macro_function_like
 };
 
   macro_function_like
 };
 

+/* Different kinds of special macros.  */
+
+enum macro_special_kind
+{
+  /* Ordinary.  */
+  macro_ordinary,
+  /* The special macro __FILE__.  */
+  macro_FILE,
+  /* The special macro __LINE__.  */
+  macro_LINE
+};

 
 /* A preprocessor symbol definition.  */
 struct macro_definition
 
 /* A preprocessor symbol definition.  */
 struct macro_definition


@@ -274,12 +292,17 @@ struct macro_definition
 
   /* If `kind' is `macro_function_like', the number of arguments it
      takes, and their names.  The names, and the array of pointers to
 
   /* If `kind' is `macro_function_like', the number of arguments it
      takes, and their names.  The names, and the array of pointers to

-     them, are in the table's bcache, if it has one.  */
-  int argc : 31;
+     them, are in the table's bcache, if it has one.  If `kind' is
+     `macro_object_like', then this is actually a `macro_special_kind'
+     describing the macro.  */
+  int argc : 30;

   const char * const *argv;
 
   const char * const *argv;
 

-  /* The replacement string (body) of the macro.  This is in the
-     table's bcache, if it has one.  */
+  /* The replacement string (body) of the macro.  For ordinary macros,
+     this is in the table's bcache, if it has one.  For special macros
+     like __FILE__, this value is only valid until the next use of any
+     special macro definition; that is, it is reset each time any
+     special macro is looked up or iterated over.  */

   const char *replacement;
 };
 
   const char *replacement;
 };
 


@@ -328,5 +351,14 @@ void macro_for_each_in_scope (struct macro_source_file *file, int line,
                              macro_callback_fn fn,
                              void *user_data);
 
                              macro_callback_fn fn,
                              void *user_data);
 

+/* Return FILE->filename with possibly prepended compilation directory name.
+   This is raw concatenation without the "set substitute-path" and gdb_realpath
+   applications done by symtab_to_fullname.  Returned string must be freed by
+   xfree.
+
+   THis function ignores the "set filename-display" setting.  Its default
+   setting is "relative" which is backward compatible but the former behavior
+   of macro filenames printing was "absolute".  */
+extern char *macro_source_fullname (struct macro_source_file *file);

 
 #endif /* MACROTAB_H */
 
 #endif /* MACROTAB_H */