aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/dissect.c
diff options
authorAlexey Gladkov <gladkov.alexey@gmail.com>2021-11-02 15:06:43 +0100
committerLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2022-05-21 10:59:45 +0200
commit2a5afb6eafe9cd781f149ab53ee6ea8f23010ee5 (patch)
tree1912c23af26d651e38cf34839fe8c45469b09f3d /dissect.c
parentc4706aa764f3ae68258ba60be6325a5662900362 (diff)
downloadsparse-dev-2a5afb6eafe9cd781f149ab53ee6ea8f23010ee5.tar.gz
dissect: Allow to show all symbols
Currently dissect sees only used symbols. For indexing purposes, it is useful to see all declared symbols. $ nl -s\ -w2 ./z.c 1 struct foo { 2 int member; 3 }; 4 #ifdef OPT 5 static void func1(void) { 6 struct foo *x; 7 return 0; 8 } 9 #endif 10 static inline void func2(void) { return; } 11 void func(void) { return; } $ ./test-dissect ./z.c FILE: ./z.c 11:6 def f func void ( ... ) $ ./test-dissect --param=dissect-show-all-symbols ./z.c FILE: ./z.c 1:8 def s foo struct foo 2:13 def m foo.member int 10:20 def f func2 void ( ... ) 11:6 def f func void ( ... ) Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Diffstat (limited to 'dissect.c')
-rw-r--r--dissect.c39
1 files changed, 38 insertions, 1 deletions
diff --git a/dissect.c b/dissect.c
index 582e8fc3..0d6c3288 100644
--- a/dissect.c
+++ b/dissect.c
@@ -652,9 +652,46 @@ static void do_sym_list(struct symbol_list *list)
DO_LIST(list, sym, do_symbol(sym));
}
+static inline bool valid_namespace(enum namespace ns)
+{
+ return (ns == NS_STRUCT || ns == NS_SYMBOL);
+}
+
+static void do_file(char *file)
+{
+ struct symbol_list *res = sparse_keep_tokens(file);
+
+ if (!dissect_show_all_symbols) {
+ do_sym_list(res);
+ goto end;
+ }
+
+ DO_LIST(file_scope->symbols, sym,
+ if (input_streams[sym->pos.stream].fd != -1 && valid_namespace(sym->namespace)) {
+ if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) {
+ sym->ctype.base_type = sym;
+ examine_sym_node(sym, NULL);
+ continue;
+ }
+
+ do_symbol(sym);
+ }
+ );
+
+ DO_LIST(global_scope->symbols, sym,
+ if (input_streams[sym->pos.stream].fd != -1 && valid_namespace(sym->namespace)) {
+ do_symbol(sym);
+ }
+ );
+
+end:
+ /* Drop the tokens for this file after parsing */
+ clear_token_alloc();
+}
+
void dissect(struct reporter *rep, struct string_list *filelist)
{
reporter = rep;
- DO_LIST(filelist, file, do_sym_list(__sparse(file)));
+ DO_LIST(filelist, file, do_file(file));
}