X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmacrotab.c;h=2e5592ba0676017863c808e5e0897c48d5ba4a10;hb=403cb6b138c38faf72f7abc034db3505b9bdb82f;hp=efcf83563e55bc585ccc42df257324eca740eabb;hpb=9b158ba08eb1ad14dc2324b8391263b228fa928a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/macrotab.c b/gdb/macrotab.c index efcf83563e..2e5592ba06 100644 --- a/gdb/macrotab.c +++ b/gdb/macrotab.c @@ -1,6 +1,5 @@ /* C preprocessor macro tables for GDB. - Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. Contributed by Red Hat, Inc. This file is part of GDB. @@ -29,6 +28,7 @@ #include "gdb_assert.h" #include "bcache.h" #include "complaints.h" +#include "macroexp.h" /* The macro table structure. */ @@ -48,6 +48,10 @@ struct macro_table #inclusion tree; everything else is #included from here. */ struct macro_source_file *main_source; + /* Compilation directory for all files of this macro table. It is allocated + on objfile's obstack. */ + const char *comp_dir; + /* True if macros in this table can be redefined without issuing an error. */ int redef_ok; @@ -128,7 +132,7 @@ macro_bcache (struct macro_table *t, const void *addr, int len) static const char * macro_bcache_str (struct macro_table *t, const char *s) { - return (char *) macro_bcache (t, s, strlen (s) + 1); + return macro_bcache (t, s, strlen (s) + 1); } @@ -463,6 +467,8 @@ macro_include (struct macro_source_file *source, the new one? */ if (*link && line == (*link)->included_at_line) { + char *link_fullname, *source_fullname; + /* This means the compiler is emitting bogus debug info. (GCC circa March 2002 did this.) It also means that the splay tree ordering function, macro_tree_compare, will abort, @@ -470,9 +476,14 @@ macro_include (struct macro_source_file *source, should tolerate bad debug info. So: First, squawk. */ + + link_fullname = macro_source_fullname (*link); + source_fullname = macro_source_fullname (source); complaint (&symfile_complaints, _("both `%s' and `%s' allegedly #included at %s:%d"), - included, (*link)->filename, source->filename, line); + included, link_fullname, source_fullname, line); + xfree (source_fullname); + xfree (link_fullname); /* Now, choose a new, unoccupied line number for this #inclusion, after the alleged #inclusion line. */ @@ -504,22 +515,6 @@ macro_lookup_inclusion (struct macro_source_file *source, const char *name) if (filename_cmp (name, source->filename) == 0) return source; - /* The filename in the source structure is probably a full path, but - NAME could be just the final component of the name. */ - { - int name_len = strlen (name); - int src_name_len = strlen (source->filename); - - /* We do mean < here, and not <=; if the lengths are the same, - then the filename_cmp above should have triggered, and we need to - check for a slash here. */ - if (name_len < src_name_len - && IS_DIR_SEPARATOR (source->filename[src_name_len - name_len - 1]) - && filename_cmp (name, - source->filename + src_name_len - name_len) == 0) - return source; - } - /* It's not us. Try all our children, and return the lowest. */ { struct macro_source_file *child; @@ -566,6 +561,7 @@ new_macro_definition (struct macro_table *t, d->table = t; d->kind = kind; d->replacement = macro_bcache_str (t, replacement); + d->argc = argc; if (kind == macro_function_like) { @@ -580,7 +576,6 @@ new_macro_definition (struct macro_table *t, /* Now bcache the array of argument pointers itself. */ d->argv = macro_bcache (t, cached_argv, cached_argv_size); - d->argc = argc; } /* We don't bcache the entire definition structure because it's got @@ -730,11 +725,17 @@ check_for_redefinition (struct macro_source_file *source, int line, if (! same) { + char *source_fullname, *found_key_fullname; + + source_fullname = macro_source_fullname (source); + found_key_fullname = macro_source_fullname (found_key->start_file); complaint (&symfile_complaints, _("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_fullname, line, found_key_fullname, + found_key->start_line); + xfree (found_key_fullname); + xfree (source_fullname); } return found_key; @@ -743,10 +744,12 @@ check_for_redefinition (struct macro_source_file *source, int line, return 0; } +/* A helper function to define a new object-like macro. */ -void -macro_define_object (struct macro_source_file *source, int line, - const char *name, const char *replacement) +static void +macro_define_object_internal (struct macro_source_file *source, int line, + const char *name, const char *replacement, + enum macro_special_kind kind) { struct macro_table *t = source->table; struct macro_key *k = NULL; @@ -772,10 +775,28 @@ macro_define_object (struct macro_source_file *source, int line, return; k = new_macro_key (t, name, source, line); - d = new_macro_definition (t, macro_object_like, 0, 0, replacement); + d = new_macro_definition (t, macro_object_like, kind, 0, replacement); splay_tree_insert (t->definitions, (splay_tree_key) k, (splay_tree_value) d); } +void +macro_define_object (struct macro_source_file *source, int line, + const char *name, const char *replacement) +{ + macro_define_object_internal (source, line, name, replacement, + macro_ordinary); +} + +/* See macrotab.h. */ + +void +macro_define_special (struct macro_table *table) +{ + macro_define_object_internal (table->main_source, -1, "__FILE__", "", + macro_FILE); + macro_define_object_internal (table->main_source, -1, "__LINE__", "", + macro_LINE); +} void macro_define_function (struct macro_source_file *source, int line, @@ -833,12 +854,17 @@ macro_undef (struct macro_source_file *source, int line, #definition. */ if (key->end_file) { + char *source_fullname, *key_fullname; + + source_fullname = macro_source_fullname (source); + key_fullname = macro_source_fullname (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); + name, source_fullname, line, key_fullname, + key->end_line); + xfree (key_fullname); + xfree (source_fullname); } /* Whether or not we've seen a prior #undefinition, wipe out @@ -860,6 +886,36 @@ macro_undef (struct macro_source_file *source, int line, } } +/* A helper function that rewrites the definition of a special macro, + when needed. */ + +static struct macro_definition * +fixup_definition (const char *filename, int line, struct macro_definition *def) +{ + static char *saved_expansion; + + if (saved_expansion) + { + xfree (saved_expansion); + saved_expansion = NULL; + } + + if (def->kind == macro_object_like) + { + if (def->argc == macro_FILE) + { + saved_expansion = macro_stringify (filename); + def->replacement = saved_expansion; + } + else if (def->argc == macro_LINE) + { + saved_expansion = xstrprintf ("%d", line); + def->replacement = saved_expansion; + } + } + + return def; +} struct macro_definition * macro_lookup_definition (struct macro_source_file *source, @@ -868,7 +924,16 @@ macro_lookup_definition (struct macro_source_file *source, splay_tree_node n = find_definition (name, source, line); if (n) - return (struct macro_definition *) n->value; + { + struct macro_definition *retval; + char *source_fullname; + + source_fullname = macro_source_fullname (source); + retval = fixup_definition (source_fullname, line, + (struct macro_definition *) n->value); + xfree (source_fullname); + return retval; + } else return 0; } @@ -911,7 +976,13 @@ 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; + struct macro_definition *def; + char *key_fullname; + + key_fullname = macro_source_fullname (key->start_file); + def = fixup_definition (key_fullname, key->start_line, + (struct macro_definition *) node->value); + xfree (key_fullname); (*datum->fn) (key->name, def, key->start_file, key->start_line, datum->user_data); @@ -937,7 +1008,13 @@ 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; + struct macro_definition *def; + char *datum_fullname; + + datum_fullname = macro_source_fullname (datum->file); + def = fixup_definition (datum_fullname, datum->line, + (struct macro_definition *) node->value); + xfree (datum_fullname); /* See if this macro is defined before the passed-in line, and extends past that line. */ @@ -972,8 +1049,8 @@ macro_for_each_in_scope (struct macro_source_file *file, int line, struct macro_table * -new_macro_table (struct obstack *obstack, - struct bcache *b) +new_macro_table (struct obstack *obstack, struct bcache *b, + const char *comp_dir) { struct macro_table *t; @@ -987,6 +1064,7 @@ new_macro_table (struct obstack *obstack, t->obstack = obstack; t->bcache = b; t->main_source = NULL; + t->comp_dir = comp_dir; t->redef_ok = 0; t->definitions = (splay_tree_new_with_allocator (macro_tree_compare, @@ -1009,3 +1087,14 @@ free_macro_table (struct macro_table *table) /* Free the table of macro definitions. */ splay_tree_delete (table->definitions); } + +/* See macrotab.h for the comment. */ + +char * +macro_source_fullname (struct macro_source_file *file) +{ + if (file->table->comp_dir == NULL || IS_ABSOLUTE_PATH (file->filename)) + return xstrdup (file->filename); + + return concat (file->table->comp_dir, SLASH_STRING, file->filename, NULL); +}