From patchwork Tue Apr 4 21:49:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9662619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D606602B9 for ; Tue, 4 Apr 2017 21:50:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FBAA28583 for ; Tue, 4 Apr 2017 21:50:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84DA2285A0; Tue, 4 Apr 2017 21:50:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33BB428583 for ; Tue, 4 Apr 2017 21:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754754AbdDDVuN (ORCPT ); Tue, 4 Apr 2017 17:50:13 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36295 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753855AbdDDVuM (ORCPT ); Tue, 4 Apr 2017 17:50:12 -0400 Received: by mail-wm0-f65.google.com with SMTP id x124so8042554wmf.3 for ; Tue, 04 Apr 2017 14:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6gP6XgLJSXlRKqPVy86rJVOC8zC5mRpO5t/smaE1amw=; b=p5Ok+ZlL5Cw7gUKTUjNIGlboRMacnU8Ad4AUNJn3weCSKdCrJbtB8SPlJnUlONqirt S4oUXtoSag3Yp0PS/H3kIHGRzdmEj39yasjwC1jAGtRK5clrunGqRYYmupcvw+5nNQf6 EMxP9jwM9/SVOplLYKSL65FnhLcNUDWt3QmbzvlaS+2kWxroI2hyugDeogAgnpY42f+1 cq5kEbZeS75zj/OUS1JaP6hPVJQ038PtGeXjtmVUE51GZ7aiL/5fHR+Uni4b/7IK+Edx bkM4UvqN/LWYyiI5FK0QK42bWcDpAta8wFP0PJe32Fefd4NbjZQ3k7WgHW2IYI3ijJ/R C3sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6gP6XgLJSXlRKqPVy86rJVOC8zC5mRpO5t/smaE1amw=; b=LxVC5TPy7diH3B7dV27rLUlseeGVJmhCpxQlASxzFja167kyZIiGZUsSPKQjlyOR3l ZWSmnKlKmJYOd0OSuk2tJo2IL5eUqXsP2idl1inOdlgGHPJwF6224WsOlN59cpAZB650 Qszg9n3tyAFFV4wH0ULKA1Tah4pYloZGwQAzBvOHp8Vtfr2nA0xfV/xBWhhM2I46JWX5 RlMPUoC+MU6SVBnaVzxwylw9G7aEa68uvLiS/84CreZ6zCmVOhHUxjjq2h2jsJ2rYsZu VTZbY0KHm83Mz7weRtzs13LBvpYhLvcnmM5hKFgBCQCY9v+8EiwiEwrHux19l9vWp9+B w5rw== X-Gm-Message-State: AFeK/H0LQVPVXAsT2owdaiIAggcV97iM3mftQTVnTYDwLV2r/Hzp89/i SU5G3EkyppGBcQ== X-Received: by 10.28.20.202 with SMTP id 193mr9825704wmu.43.1491342611083; Tue, 04 Apr 2017 14:50:11 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:88d:1900:706c:6cb1:d133:7ca3]) by smtp.gmail.com with ESMTPSA id 51sm23827153wrx.38.2017.04.04.14.50.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 14:50:10 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH 2/6] teach sparse how to dump macro definitions Date: Tue, 4 Apr 2017 23:49:51 +0200 Message-Id: <20170404214955.47926-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170404214955.47926-1-luc.vanoostenryck@gmail.com> References: <20170404214955.47926-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Luc Van Oostenryck --- lib.h | 1 + pre-process.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/lib.h b/lib.h index 19b5cb0b3..f2df4aa1d 100644 --- a/lib.h +++ b/lib.h @@ -141,6 +141,7 @@ extern int arch_m64; extern void declare_builtin_functions(void); extern void create_builtin_stream(void); +extern void dump_macro_definitions(void); extern struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list **files); extern struct symbol_list *__sparse(char *filename); extern struct symbol_list *sparse_keep_tokens(char *filename); diff --git a/pre-process.c b/pre-process.c index 7c57ba1cd..74414dfeb 100644 --- a/pre-process.c +++ b/pre-process.c @@ -44,6 +44,7 @@ #include "expression.h" #include "scope.h" +static struct ident_list *macros; // only needed for -dD static int false_nesting = 0; static int counter_macro = 0; // __COUNTER__ expansion @@ -1351,6 +1352,7 @@ static int do_handle_define(struct stream *stream, struct token **line, struct t if (!sym || sym->scope != file_scope) { sym = alloc_symbol(left->pos, SYM_NODE); bind_symbol(sym, name, NS_MACRO); + add_ident(¯os, name); ret = 0; } @@ -2010,3 +2012,56 @@ struct token * preprocess(struct token *token) return token; } + +static void dump_macro(struct symbol *sym) +{ + int nargs = sym->arglist ? sym->arglist->count.normal : 0; + struct token *args[nargs]; + struct token *token; + + printf("#define %s", show_ident(sym->ident)); + token = sym->arglist; + if (token) { + const char *sep = ""; + int narg = 0; + putchar('('); + for (; !eof_token(token); token = token->next) { + if (token_type(token) == TOKEN_ARG_COUNT) + continue; + printf("%s%s", sep, show_token(token)); + args[narg++] = token; + sep = ", "; + } + putchar(')'); + } + putchar(' '); + + token = sym->expansion; + while (!eof_token(token)) { + struct token *next = token->next; + switch (token_type(token)) { + case TOKEN_UNTAINT: + break; + case TOKEN_MACRO_ARGUMENT: + token = args[token->argnum]; + /* fall-through */ + default: + printf("%s", show_token(token)); + if (next->pos.whitespace) + putchar(' '); + } + token = next; + } + putchar('\n'); +} + +void dump_macro_definitions(void) +{ + struct ident *name; + + FOR_EACH_PTR(macros, name) { + struct symbol *sym = lookup_macro(name); + if (sym) + dump_macro(sym); + } END_FOR_EACH_PTR(name); +}