From patchwork Tue Nov 2 14:06:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Gladkov X-Patchwork-Id: 12598987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 403D2C433EF for ; Tue, 2 Nov 2021 14:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24D2060F90 for ; Tue, 2 Nov 2021 14:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231157AbhKBOMI convert rfc822-to-8bit (ORCPT ); Tue, 2 Nov 2021 10:12:08 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:60748 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231661AbhKBOME (ORCPT ); Tue, 2 Nov 2021 10:12:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-llzvscCSNAadcKkhENCGlQ-1; Tue, 02 Nov 2021 10:09:22 -0400 X-MC-Unique: llzvscCSNAadcKkhENCGlQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA2778C365F; Tue, 2 Nov 2021 14:07:49 +0000 (UTC) Received: from comp-core-i7-2640m-0182e6.redhat.com (unknown [10.36.110.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CCEC6785A; Tue, 2 Nov 2021 14:07:48 +0000 (UTC) From: Alexey Gladkov To: Luc Van Oostenryck Cc: linux-sparse@vger.kernel.org, Oleg Nesterov , Alexey Gladkov Subject: [PATCH 1/3] dissect: Allow to show all symbols Date: Tue, 2 Nov 2021 15:06:43 +0100 Message-Id: <20211102140645.83081-2-gladkov.alexey@gmail.com> In-Reply-To: <20211102140645.83081-1-gladkov.alexey@gmail.com> References: <20211102140645.83081-1-gladkov.alexey@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org 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 --- dissect.c | 39 ++++++++++++++++++++++++++++++++++++++- options.c | 5 +++++ options.h | 2 ++ semind.c | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) 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)); } diff --git a/options.c b/options.c index 6704fc8d..b4684357 100644 --- a/options.c +++ b/options.c @@ -70,6 +70,8 @@ int dbg_postorder = 0; int dump_macro_defs = 0; int dump_macros_only = 0; +int dissect_show_all_symbols = 0; + unsigned long fdump_ir; int fhosted = 1; unsigned int fmax_errors = 100; @@ -958,6 +960,9 @@ static char **handle_param(char *arg, char **next) if (!value) die("missing argument for --param option"); + if (!strcmp(value, "dissect-show-all-symbols")) + dissect_show_all_symbols = 1; + return next; } diff --git a/options.h b/options.h index 0aec8764..c2a9551a 100644 --- a/options.h +++ b/options.h @@ -70,6 +70,8 @@ extern int dbg_postorder; extern int dump_macro_defs; extern int dump_macros_only; +extern int dissect_show_all_symbols; + extern unsigned long fdump_ir; extern int fhosted; extern unsigned int fmax_errors; diff --git a/semind.c b/semind.c index 911fc747..ad8003ba 100644 --- a/semind.c +++ b/semind.c @@ -329,6 +329,7 @@ done: optind--; sparse_initialize(argc - optind, argv + optind, &semind_filelist); + dissect_show_all_symbols = 1; } static void parse_cmdline_rm(int argc, char **argv) From patchwork Tue Nov 2 14:06:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Gladkov X-Patchwork-Id: 12598991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D07F2C433F5 for ; Tue, 2 Nov 2021 14:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC02560F58 for ; Tue, 2 Nov 2021 14:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbhKBOMW convert rfc822-to-8bit (ORCPT ); Tue, 2 Nov 2021 10:12:22 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:42767 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230257AbhKBOMW (ORCPT ); Tue, 2 Nov 2021 10:12:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-8Hzs58R7O-GzEK3NfkDYTA-1; Tue, 02 Nov 2021 10:09:44 -0400 X-MC-Unique: 8Hzs58R7O-GzEK3NfkDYTA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7162E136435; Tue, 2 Nov 2021 14:07:51 +0000 (UTC) Received: from comp-core-i7-2640m-0182e6.redhat.com (unknown [10.36.110.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3586B67855; Tue, 2 Nov 2021 14:07:50 +0000 (UTC) From: Alexey Gladkov To: Luc Van Oostenryck Cc: linux-sparse@vger.kernel.org, Oleg Nesterov , Alexey Gladkov Subject: [PATCH 2/3] dissect: Show macro definitions Date: Tue, 2 Nov 2021 15:06:44 +0100 Message-Id: <20211102140645.83081-3-gladkov.alexey@gmail.com> In-Reply-To: <20211102140645.83081-1-gladkov.alexey@gmail.com> References: <20211102140645.83081-1-gladkov.alexey@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gladkov.alexey@gmail.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org Add the ability to dissect to see macro definitions. The patch does not add full support for the usage of macros, but only their definitions. Signed-off-by: Alexey Gladkov --- dissect.c | 13 ++++++++++++- test-dissect.c | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dissect.c b/dissect.c index 0d6c3288..7d5d92c9 100644 --- a/dissect.c +++ b/dissect.c @@ -610,6 +610,11 @@ static struct symbol *do_initializer(struct symbol *type, struct expression *exp return type; } +static inline bool is_macro(struct symbol *sym) +{ + return (sym->namespace == NS_MACRO || sym->namespace == NS_UNDEF); +} + static inline struct symbol *do_symbol(struct symbol *sym) { struct symbol *type = base_type(sym); @@ -654,7 +659,7 @@ static void do_sym_list(struct symbol_list *list) static inline bool valid_namespace(enum namespace ns) { - return (ns == NS_STRUCT || ns == NS_SYMBOL); + return (ns == NS_MACRO || ns == NS_UNDEF || ns == NS_STRUCT || ns == NS_SYMBOL); } static void do_file(char *file) @@ -668,6 +673,12 @@ static void do_file(char *file) DO_LIST(file_scope->symbols, sym, if (input_streams[sym->pos.stream].fd != -1 && valid_namespace(sym->namespace)) { + if (is_macro(sym)) { + sym->kind = 'd'; + reporter->r_symdef(sym); + continue; + } + if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) { sym->ctype.base_type = sym; examine_sym_node(sym, NULL); diff --git a/test-dissect.c b/test-dissect.c index 58b3e633..3d870a97 100644 --- a/test-dissect.c +++ b/test-dissect.c @@ -57,11 +57,12 @@ static void r_symbol(unsigned mode, struct position *pos, struct symbol *sym) show_typename(sym->ctype.base_type)); switch (sym->kind) { + case 'd': + break; case 's': if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) break; goto err; - case 'f': if (sym->type != SYM_BAD && sym->ctype.base_type->type != SYM_FN) goto err; From patchwork Tue Nov 2 14:06:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Gladkov X-Patchwork-Id: 12598985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51636C433FE for ; Tue, 2 Nov 2021 14:09:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CF3960E90 for ; Tue, 2 Nov 2021 14:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231511AbhKBOLl convert rfc822-to-8bit (ORCPT ); Tue, 2 Nov 2021 10:11:41 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:58926 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231495AbhKBOLb (ORCPT ); Tue, 2 Nov 2021 10:11:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-30-RxwX79zlM6-WkD0MS9tUBQ-1; Tue, 02 Nov 2021 10:08:54 -0400 X-MC-Unique: RxwX79zlM6-WkD0MS9tUBQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47882104337F; Tue, 2 Nov 2021 14:07:53 +0000 (UTC) Received: from comp-core-i7-2640m-0182e6.redhat.com (unknown [10.36.110.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B2CC6A242; Tue, 2 Nov 2021 14:07:51 +0000 (UTC) From: Alexey Gladkov To: Luc Van Oostenryck Cc: linux-sparse@vger.kernel.org, Oleg Nesterov , Alexey Gladkov Subject: [PATCH 3/3] dissect: Show typedefs Date: Tue, 2 Nov 2021 15:06:45 +0100 Message-Id: <20211102140645.83081-4-gladkov.alexey@gmail.com> In-Reply-To: <20211102140645.83081-1-gladkov.alexey@gmail.com> References: <20211102140645.83081-1-gladkov.alexey@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gladkov.alexey@gmail.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org For indexing purposes, it is useful to see type definitions. $ semind search __kernel_ulong_t (def) include/uapi/asm-generic/posix_types.h 16 23 typedef unsigned long __kernel_ulong_t; Signed-off-by: Alexey Gladkov --- dissect.c | 13 ++++++++++++- test-dissect.c | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dissect.c b/dissect.c index 7d5d92c9..300d5ca9 100644 --- a/dissect.c +++ b/dissect.c @@ -615,6 +615,11 @@ static inline bool is_macro(struct symbol *sym) return (sym->namespace == NS_MACRO || sym->namespace == NS_UNDEF); } +static inline bool is_typedef(struct symbol *sym) +{ + return (sym->namespace == NS_TYPEDEF); +} + static inline struct symbol *do_symbol(struct symbol *sym) { struct symbol *type = base_type(sym); @@ -659,7 +664,7 @@ static void do_sym_list(struct symbol_list *list) static inline bool valid_namespace(enum namespace ns) { - return (ns == NS_MACRO || ns == NS_UNDEF || ns == NS_STRUCT || ns == NS_SYMBOL); + return (ns == NS_TYPEDEF || ns == NS_MACRO || ns == NS_UNDEF || ns == NS_STRUCT || ns == NS_SYMBOL); } static void do_file(char *file) @@ -673,6 +678,12 @@ static void do_file(char *file) DO_LIST(file_scope->symbols, sym, if (input_streams[sym->pos.stream].fd != -1 && valid_namespace(sym->namespace)) { + if (is_typedef(sym)) { + sym->kind = 't'; + reporter->r_symdef(sym); + continue; + } + if (is_macro(sym)) { sym->kind = 'd'; reporter->r_symdef(sym); diff --git a/test-dissect.c b/test-dissect.c index 3d870a97..65b205f8 100644 --- a/test-dissect.c +++ b/test-dissect.c @@ -63,6 +63,8 @@ static void r_symbol(unsigned mode, struct position *pos, struct symbol *sym) if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) break; goto err; + case 't': + break; case 'f': if (sym->type != SYM_BAD && sym->ctype.base_type->type != SYM_FN) goto err;