14bc53a814
I wanted to pass a lambda to iterate_over_symtabs (see following patch), so I converted it to function_view, and then the rest is cascaded from that. This gets rid of a bunch of single-use callback functions and corresponding manually managed callback capture types (add_partial_datum, search_symbols_data, etc.) in favor of letting the compiler generate them for us by using lambdas with a capture. In a couple cases, it was more natural to convert the existing function callbacks to function objects (i.e., operator(), e.g., decode_compound_collector). gdb/ChangeLog: 2017-02-23 Pedro Alves <palves@redhat.com> * ada-lang.c: Include "common/function-view.h". (ada_iterate_over_symbols): Adjust to use function_view as callback type. (struct add_partial_datum, ada_complete_symbol_matcher): Delete. (ada_make_symbol_completion_list): Use a lambda. (ada_exc_search_name_matches): Delete. (name_matches_regex): New. (ada_add_global_exceptions): Use a lambda and name_matches_regex. * compile/compile-c-support.c: Include "common/function-view.h". (print_one_macro): Change prototype to accept a ui_file pointer. (write_macro_definitions): Use a lambda. * dwarf2read.c: Include "common/function-view.h". (dw2_map_expand_apply, dw2_map_symtabs_matching_filename) (dw2_expand_symtabs_matching): Adjust to use function_view as callback type. * language.h: Include "common/function-view.h". (struct language_defn) <la_iterate_over_symbols>: Adjust to use function_view as callback type. (LA_ITERATE_OVER_SYMBOLS): Remove DATA parameter. * linespec.c: Include "common/function-view.h". (collect_info::add_symbol): New method. (struct symbol_and_data_callback, iterate_inline_only, struct symbol_matcher_data, iterate_name_matcher): Delete. (iterate_over_all_matching_symtabs): Adjust to use function_view as callback type and lambdas. (iterate_over_file_blocks): Adjust to use function_view as callback type. (decode_compound_collector): Now a class with private fields. (decode_compound_collector::release_symbols): New method. (collect_one_symbol): Rename to... (decode_compound_collector::operator()): ... this and adjust. (lookup_prefix_sym): decode_compound_collector construction bits move to decode_compound_collector ctor. Pass the decode_compound_collector object directly as callback. Remove cleanups and use decode_compound_collector::release_symbols instead. (symtab_collector): Now a class with private fields. (symtab_collector::release_symtabs): New method. (add_symtabs_to_list): Rename to... (symtab_collector::operator()): ... this and adjust. (collect_symtabs_from_filename): symtab_collector construction bits move to symtab_collector ctor. Pass the symtab_collector object directly as callback. Remove cleanups and use symtab_collector::release_symtabs instead. (collect_symbols): Delete. (add_matching_symbols_to_info): Use lambdas. * macrocmd.c (print_macro_callback): Delete. (info_macro_command): Use a lambda. (info_macros_command): Pass print_macro_definition as callable directly. (print_one_macro): Remove 'ignore' parameter. (macro_list_command): Adjust. * macrotab.c (macro_for_each_data::fn): Now a function_view. (macro_for_each_data::user_data): Delete field. (foreach_macro): Adjust to call the function_view. (macro_for_each): Adjust to use function_view as callback type. (foreach_macro_in_scope): Adjust to call the function_view. (macro_for_each_in_scope): Adjust to use function_view as callback type. * macrotab.h: Include "common/function-view.h". (macro_callback_fn): Declare a prototype instead of a pointer. Remove "user_data" parameter. (macro_for_each, macro_for_each_in_scope): Adjust to use function_view as callback type. * psymtab.c (partial_map_expand_apply) (psym_map_symtabs_matching_filename, recursively_search_psymtabs): Adjust to use function_view as callback type and to return bool. (psym_expand_symtabs_matching): Adjust to use function_view as callback types. * symfile-debug.c (debug_qf_map_symtabs_matching_filename): Adjust to use function_view as callback type and to return bool. (debug_qf_expand_symtabs_matching): Adjust to use function_view as callback types. * symfile.c (expand_symtabs_matching): Adjust to use function_view as callback types. * symfile.h: Include "common/function-view.h". (expand_symtabs_file_matcher_ftype) (expand_symtabs_symbol_matcher_ftype) (expand_symtabs_exp_notify_ftype): Remove "data" parameter and return bool. (quick_symbol_functions::map_symtabs_matching_filename) (quick_symbol_functions::expand_symtabs_matching): Adjust to use function_view as callback type and return bool. (expand_symtabs_matching): Adjust to use function_view as callback type. (maintenance_expand_name_matcher) (maintenance_expand_file_matcher): Delete. (maintenance_expand_symtabs): Use lambdas. * symtab.c (iterate_over_some_symtabs): Adjust to use function_view as callback types and return bool. (iterate_over_symtabs): Likewise. Use unique_xmalloc_ptr instead of a cleanup. (lookup_symtab_callback): Delete. (lookup_symtab): Use a lambda. (iterate_over_symbols): Adjust to use function_view as callback type. (struct search_symbols_data, search_symbols_file_matches) (search_symbols_name_matches): Delete. (search_symbols): Use a pair of lambdas. (struct add_name_data, add_macro_name, symbol_completion_matcher) (symtab_expansion_callback): Delete. (default_make_symbol_completion_list_break_on_1): Use lambdas. * symtab.h: Include "common/function-view.h". (iterate_over_some_symtabs): Adjust to use function_view as callback type and return bool. (iterate_over_symtabs): Adjust to use function_view as callback type. (symbol_found_callback_ftype): Remove 'data' parameter and return bool. (iterate_over_symbols): Adjust to use function_view as callback type.
363 lines
15 KiB
C
363 lines
15 KiB
C
/* Interface to C preprocessor macro tables for GDB.
|
|
Copyright (C) 2002-2017 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
|
|
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,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef MACROTAB_H
|
|
#define MACROTAB_H
|
|
|
|
#include "common/function-view.h"
|
|
|
|
struct obstack;
|
|
struct bcache;
|
|
struct compunit_symtab;
|
|
|
|
/* How do we represent a source location? I mean, how should we
|
|
represent them within GDB; the user wants to use all sorts of
|
|
ambiguous abbreviations, like "break 32" and "break foo.c:32"
|
|
("foo.c" may have been #included into several compilation units),
|
|
but what do we disambiguate those things to?
|
|
|
|
- Answer 1: "Filename and line number." (Or column number, if
|
|
you're picky.) That's not quite good enough. For example, the
|
|
same source file can be #included into several different
|
|
compilation units --- which #inclusion do you mean?
|
|
|
|
- Answer 2: "Compilation unit, filename, and line number." This is
|
|
a pretty good answer; GDB's `struct symtab_and_line' basically
|
|
embodies this representation. But it's still ambiguous; what if a
|
|
given compilation unit #includes the same file twice --- how can I
|
|
set a breakpoint on line 12 of the fifth #inclusion of "foo.c"?
|
|
|
|
- Answer 3: "Compilation unit, chain of #inclusions, and line
|
|
number." This is analogous to the way GCC reports errors in
|
|
#include files:
|
|
|
|
$ gcc -c base.c
|
|
In file included from header2.h:8,
|
|
from header1.h:3,
|
|
from base.c:5:
|
|
header3.h:1: parse error before ')' token
|
|
$
|
|
|
|
GCC tells you exactly what path of #inclusions led you to the
|
|
problem. It gives you complete information, in a way that the
|
|
following would not:
|
|
|
|
$ gcc -c base.c
|
|
header3.h:1: parse error before ')' token
|
|
$
|
|
|
|
Converting all of GDB to use this is a big task, and I'm not really
|
|
suggesting it should be a priority. But this module's whole
|
|
purpose is to maintain structures describing the macro expansion
|
|
process, so I think it's appropriate for us to take a little care
|
|
to do that in a complete fashion.
|
|
|
|
In this interface, the first line of a file is numbered 1, not 0.
|
|
This is the same convention the rest of GDB uses. */
|
|
|
|
|
|
/* A table of all the macro definitions for a given compilation unit. */
|
|
struct macro_table;
|
|
|
|
/* The definition of a single macro. */
|
|
struct macro_definition;
|
|
|
|
/* A source file that participated in a compilation unit --- either a
|
|
main file, or an #included file. If a file is #included more than
|
|
once, the presence of the `included_from' and `included_at_line'
|
|
members means that we need to make one instance of this structure
|
|
for each #inclusion. Taken as a group, these structures form a
|
|
tree mapping the #inclusions that contributed to the compilation
|
|
unit, with the main source file as its root.
|
|
|
|
Beware --- not every source file mentioned in a compilation unit's
|
|
symtab structures will appear in the #inclusion tree! As of Oct
|
|
2002, GCC does record the effect of #line directives in the source
|
|
line info, but not in macro info. This means that GDB's symtabs
|
|
(built from the former, among other things) may mention filenames
|
|
that the #inclusion tree (built from the latter) doesn't have any
|
|
record of. See macroscope.c:sal_macro_scope for how to accomodate
|
|
this.
|
|
|
|
It's worth noting that libcpp has a simpler way of representing all
|
|
this, which we should consider switching to. It might even be
|
|
suitable for ordinary non-macro line number info.
|
|
|
|
Suppose you take your main source file, and after each line
|
|
containing an #include directive you insert the text of the
|
|
#included file. The result is a big file that pretty much
|
|
corresponds to the full text the compiler's going to see. There's
|
|
a one-to-one correspondence between lines in the big file and
|
|
per-inclusion lines in the source files. (Obviously, #include
|
|
directives that are #if'd out don't count. And you'll need to
|
|
append a newline to any file that doesn't end in one, to avoid
|
|
splicing the last #included line with the next line of the
|
|
#including file.)
|
|
|
|
Libcpp calls line numbers in this big imaginary file "logical line
|
|
numbers", and has a data structure called a "line map" that can map
|
|
logical line numbers onto actual source filenames and line numbers,
|
|
and also tell you the chain of #inclusions responsible for any
|
|
particular logical line number. Basically, this means you can pass
|
|
around a single line number and some kind of "compilation unit"
|
|
object and you get nice, unambiguous source code locations that
|
|
distinguish between multiple #inclusions of the same file, etc.
|
|
|
|
Pretty neat, huh? */
|
|
|
|
struct macro_source_file
|
|
{
|
|
|
|
/* The macro table for the compilation unit this source location is
|
|
a part of. */
|
|
struct macro_table *table;
|
|
|
|
/* 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
|
|
compilation unit's main source file. */
|
|
struct macro_source_file *included_by;
|
|
|
|
/* If `included_from' is non-zero, the line number in that source
|
|
file at which we were included. */
|
|
int included_at_line;
|
|
|
|
/* Head of a linked list of the source files #included by this file;
|
|
our children in the #inclusion tree. This list is sorted by its
|
|
elements' `included_at_line' values, which are unique. (The
|
|
macro splay tree's ordering function needs this property.) */
|
|
struct macro_source_file *includes;
|
|
|
|
/* The next file #included by our `included_from' file; our sibling
|
|
in the #inclusion tree. */
|
|
struct macro_source_file *next_included;
|
|
};
|
|
|
|
|
|
/* Create a new, empty macro table. Allocate it in OBSTACK, or use
|
|
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. CUST is a pointer to the containing
|
|
compilation unit, or NULL if there isn't one.
|
|
|
|
Note that, if either OBSTACK or BCACHE are non-zero, then removing
|
|
information from the table may leak memory. Neither obstacks nor
|
|
bcaches really allow you to remove information, so although we can
|
|
update the data structure to record the change, we can't free the
|
|
old data. At the moment, since we only provide obstacks and
|
|
bcaches for macro tables for symtabs, this isn't a problem; only
|
|
odd debugging information makes a definition and then deletes it at
|
|
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 compunit_symtab *cust);
|
|
|
|
|
|
/* Free TABLE, and any macro definitions, source file structures,
|
|
etc. it owns. This will raise an internal error if TABLE was
|
|
allocated on an obstack, or if it uses a bcache. */
|
|
void free_macro_table (struct macro_table *table);
|
|
|
|
|
|
/* Set FILENAME as the main source file of TABLE. Return a source
|
|
file structure describing that file; if we record the #definition
|
|
of macros, or the #inclusion of other files into FILENAME, we'll
|
|
use that source file structure to indicate the context.
|
|
|
|
The "main source file" is the one that was given to the compiler;
|
|
all other source files that contributed to the compilation unit are
|
|
#included, directly or indirectly, from this one.
|
|
|
|
The macro table makes its own copy of FILENAME; the caller is
|
|
responsible for freeing FILENAME when it is no longer needed. */
|
|
struct macro_source_file *macro_set_main (struct macro_table *table,
|
|
const char *filename);
|
|
|
|
|
|
/* Return the main source file of the macro table TABLE. */
|
|
struct macro_source_file *macro_main (struct macro_table *table);
|
|
|
|
/* Mark the macro table TABLE so that macros defined in this table can
|
|
be redefined without error. Note that it invalid to call this if
|
|
TABLE is allocated on an obstack. */
|
|
void macro_allow_redefinitions (struct macro_table *table);
|
|
|
|
|
|
/* Record a #inclusion.
|
|
Record in SOURCE's macro table that, at line number LINE in SOURCE,
|
|
we #included the file INCLUDED. Return a source file structure we
|
|
can use for symbols #defined or files #included into that. If we've
|
|
already created a source file structure for this #inclusion, return
|
|
the same structure we created last time.
|
|
|
|
The first line of the source file has a line number of 1, not 0.
|
|
|
|
The macro table makes its own copy of INCLUDED; the caller is
|
|
responsible for freeing INCLUDED when it is no longer needed. */
|
|
struct macro_source_file *macro_include (struct macro_source_file *source,
|
|
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
|
|
none. NAME is only the final portion of the filename, not the full
|
|
path. e.g., `stdio.h', not `/usr/include/stdio.h'. If NAME
|
|
appears more than once in the inclusion tree, return the
|
|
least-nested inclusion --- the one closest to the main source file. */
|
|
struct macro_source_file *(macro_lookup_inclusion
|
|
(struct macro_source_file *source,
|
|
const char *name));
|
|
|
|
|
|
/* Record an object-like #definition (i.e., one with no parameter list).
|
|
Record in SOURCE's macro table that, at line number LINE in SOURCE,
|
|
we #defined a preprocessor symbol named NAME, whose replacement
|
|
string is REPLACEMENT. This function makes copies of NAME and
|
|
REPLACEMENT; the caller is responsible for freeing them. */
|
|
void macro_define_object (struct macro_source_file *source, int line,
|
|
const char *name, const char *replacement);
|
|
|
|
|
|
/* Record an function-like #definition (i.e., one with a parameter list).
|
|
|
|
Record in SOURCE's macro table that, at line number LINE in SOURCE,
|
|
we #defined a preprocessor symbol named NAME, with ARGC arguments
|
|
whose names are given in ARGV, whose replacement string is REPLACEMENT. If
|
|
the macro takes a variable number of arguments, then ARGC should be
|
|
one greater than the number of named arguments, and ARGV[ARGC-1]
|
|
should be the string "...". This function makes its own copies of
|
|
NAME, ARGV, and REPLACEMENT; the caller is responsible for freeing
|
|
them. */
|
|
void macro_define_function (struct macro_source_file *source, int line,
|
|
const char *name, int argc, const char **argv,
|
|
const char *replacement);
|
|
|
|
|
|
/* Record an #undefinition.
|
|
Record in SOURCE's macro table that, at line number LINE in SOURCE,
|
|
we removed the definition for the preprocessor symbol named NAME. */
|
|
void macro_undef (struct macro_source_file *source, int line,
|
|
const char *name);
|
|
|
|
/* Different kinds of macro definitions. */
|
|
enum macro_kind
|
|
{
|
|
macro_object_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
|
|
{
|
|
/* The table this definition lives in. */
|
|
struct macro_table *table;
|
|
|
|
/* What kind of macro it is. */
|
|
ENUM_BITFIELD (macro_kind) kind : 1;
|
|
|
|
/* 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. If `kind' is
|
|
`macro_object_like', then this is actually a `macro_special_kind'
|
|
describing the macro. */
|
|
int argc : 30;
|
|
const char * const *argv;
|
|
|
|
/* 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;
|
|
};
|
|
|
|
|
|
/* Return a pointer to the macro definition for NAME in scope at line
|
|
number LINE of SOURCE. If LINE is -1, return the definition in
|
|
effect at the end of the file. The macro table owns the structure;
|
|
the caller need not free it. Return zero if NAME is not #defined
|
|
at that point. */
|
|
struct macro_definition *(macro_lookup_definition
|
|
(struct macro_source_file *source,
|
|
int line, const char *name));
|
|
|
|
|
|
/* Return the source location of the definition for NAME in scope at
|
|
line number LINE of SOURCE. Set *DEFINITION_LINE to the line
|
|
number of the definition, and return a source file structure for
|
|
the file. Return zero if NAME has no definition in scope at that
|
|
point, and leave *DEFINITION_LINE unchanged. */
|
|
struct macro_source_file *(macro_definition_location
|
|
(struct macro_source_file *source,
|
|
int line,
|
|
const char *name,
|
|
int *definition_line));
|
|
|
|
/* Prototype for a callback callable when walking a macro table. NAME
|
|
is the name of the macro, and DEFINITION is the definition. SOURCE
|
|
is the file at the start of the include path, and LINE is the line
|
|
number of the SOURCE file where the macro was defined. */
|
|
typedef void (macro_callback_fn) (const char *name,
|
|
const struct macro_definition *definition,
|
|
struct macro_source_file *source,
|
|
int line);
|
|
|
|
/* Call the callable FN for each macro in the macro table TABLE. */
|
|
void macro_for_each (struct macro_table *table,
|
|
gdb::function_view<macro_callback_fn> fn);
|
|
|
|
/* Call FN for each macro that is visible in a given scope. The scope
|
|
is represented by FILE and LINE. */
|
|
void macro_for_each_in_scope (struct macro_source_file *file, int line,
|
|
gdb::function_view<macro_callback_fn> fn);
|
|
|
|
/* 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 */
|