From patchwork Fri Jan 15 23:43:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12024399 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47924C4332D for ; Fri, 15 Jan 2021 23:44:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 101FE221ED for ; Fri, 15 Jan 2021 23:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728073AbhAOXod (ORCPT ); Fri, 15 Jan 2021 18:44:33 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:64013 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbhAOXod (ORCPT ); Fri, 15 Jan 2021 18:44:33 -0500 Received: from grover.flets-west.jp (softbank126026094251.bbtec.net [126.26.94.251]) (authenticated) by conuserg-12.nifty.com with ESMTP id 10FNhKIA008447; Sat, 16 Jan 2021 08:43:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 10FNhKIA008447 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1610754201; bh=X95nt+nStFbSXLK82H480Vb9TvXIBPghJobLO+NTN6U=; h=From:To:Cc:Subject:Date:From; b=qkgKHE7okjmUZ2Ed4FEUsvU7atpHr4/dyXrRuq5oDX09nZ9ZaGd6Uu/eVyyAmcgxT IFzGb2EV2DwNinx76b/by03XB8921QlldajHXuRwU3I0XkFkmLlM4SRXeN1w0AjiZu xaA6tHOBe50GQbrSlx3cTSy8xCuzMX0vHSNymBjbYFD/HYE3cPGynV8tmwS6Kz6cvr QTjLnQAu3rRZ2bUi5c1yYD1TjHhvIh+c+v2ejSBWYeCIRkOoAN6TVGhReA5HW6An+d ctfVfUtLvmPwH58TB5QPyZtIxRauJgK+X/KQtbNTGuTfyWsPZoQEMbVi4fIkHNrYeP HAc7dSB/sEqzw== X-Nifty-SrcIP: [126.26.94.251] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Marco Elver , Nick Desaulniers , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] genksyms: make source_file a local variable in lexer Date: Sat, 16 Jan 2021 08:43:02 +0900 Message-Id: <20210115234305.87205-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This is only used in yylex() in lex.l Signed-off-by: Masahiro Yamada --- scripts/genksyms/genksyms.c | 2 +- scripts/genksyms/genksyms.h | 2 +- scripts/genksyms/lex.l | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index 23eff234184f..4827c5abe5b7 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -29,7 +29,7 @@ static struct symbol *symtab[HASH_BUCKETS]; static FILE *debugfile; int cur_line = 1; -char *cur_filename, *source_file; +char *cur_filename; int in_source_file; static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types, diff --git a/scripts/genksyms/genksyms.h b/scripts/genksyms/genksyms.h index 2bcdb9bebab4..21ed2ec2d98c 100644 --- a/scripts/genksyms/genksyms.h +++ b/scripts/genksyms/genksyms.h @@ -47,7 +47,7 @@ typedef struct string_list **yystype; #define YYSTYPE yystype extern int cur_line; -extern char *cur_filename, *source_file; +extern char *cur_filename; extern int in_source_file; struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact); diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l index ae76472efc43..9e88c100fc28 100644 --- a/scripts/genksyms/lex.l +++ b/scripts/genksyms/lex.l @@ -125,6 +125,7 @@ yylex(void) static int suppress_type_lookup, dont_want_brace_phrase; static struct string_list *next_node; + static char *source_file; int token, count = 0; struct string_list *cur_node; From patchwork Fri Jan 15 23:43:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12024397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D881DC433E9 for ; Fri, 15 Jan 2021 23:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4E8E2151B for ; Fri, 15 Jan 2021 23:44:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728659AbhAOXoc (ORCPT ); Fri, 15 Jan 2021 18:44:32 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:64011 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727477AbhAOXoc (ORCPT ); Fri, 15 Jan 2021 18:44:32 -0500 Received: from grover.flets-west.jp (softbank126026094251.bbtec.net [126.26.94.251]) (authenticated) by conuserg-12.nifty.com with ESMTP id 10FNhKIB008447; Sat, 16 Jan 2021 08:43:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 10FNhKIB008447 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1610754201; bh=2i9d/z2KNaQrqIwmRk7gE7al6qQ1J5x6IOib4mSYk5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LDVWGc935cvrZZCu08FQTJTWEyCu0DB8hZPIvFVsl81wTnK+02k+OUiyR5mAfqGjh +UgFKZULMcmYhrUDhjX8DgCs1GEaXorC5rAWZaqT/78zhWM+8LfoX4WpiBz6WjRGer wVZBKb0c0J8I2xQu4uRyAMG8yGqk7XnF6OtUIPMhBlkunyXElDNvjMQ593W4FOt9wn SrTzTNn2op3MixVB9mFKP7RUgOeXEDQodaa+OJP6ubFJG2len5cfFUMqdILvIiyTp3 oNz4hJ1jrK/YpAZcm6AAgoTBqV7fhudeI4oh+MoPxcrlEMf382JQOo092ZRcgxrFZM APulFA8kK2Bmg== X-Nifty-SrcIP: [126.26.94.251] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Marco Elver , Nick Desaulniers , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] genksyms: remove dead code for ST_TABLE_* Date: Sat, 16 Jan 2021 08:43:03 +0900 Message-Id: <20210115234305.87205-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115234305.87205-1-masahiroy@kernel.org> References: <20210115234305.87205-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org No one sets lexstate to ST_TABLE_*. It is is very old code, and I do not know what was the plan at that time. Let's remove the dead code. Signed-off-by: Masahiro Yamada --- scripts/genksyms/lex.l | 54 ------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l index 9e88c100fc28..9cb075cf6a34 100644 --- a/scripts/genksyms/lex.l +++ b/scripts/genksyms/lex.l @@ -119,8 +119,6 @@ yylex(void) static enum { ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1, ST_BRACKET, ST_BRACE, ST_EXPRESSION, ST_STATIC_ASSERT, - ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4, - ST_TABLE_5, ST_TABLE_6 } lexstate = ST_NOTSTARTED; static int suppress_type_lookup, dont_want_brace_phrase; @@ -427,58 +425,6 @@ repeat: } break; - case ST_TABLE_1: - goto repeat; - - case ST_TABLE_2: - if (token == IDENT && yyleng == 1 && yytext[0] == 'X') - { - token = EXPORT_SYMBOL_KEYW; - lexstate = ST_TABLE_5; - APP; - break; - } - lexstate = ST_TABLE_6; - /* FALLTHRU */ - - case ST_TABLE_6: - switch (token) - { - case '{': case '[': case '(': - ++count; - break; - case '}': case ']': case ')': - --count; - break; - case ',': - if (count == 0) - lexstate = ST_TABLE_2; - break; - }; - goto repeat; - - case ST_TABLE_3: - goto repeat; - - case ST_TABLE_4: - if (token == ';') - lexstate = ST_NORMAL; - goto repeat; - - case ST_TABLE_5: - switch (token) - { - case ',': - token = ';'; - lexstate = ST_TABLE_2; - APP; - break; - default: - APP; - break; - } - break; - default: exit(1); } From patchwork Fri Jan 15 23:43:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12024401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51372C43331 for ; Fri, 15 Jan 2021 23:44:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F25C221FA for ; Fri, 15 Jan 2021 23:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728774AbhAOXoj (ORCPT ); Fri, 15 Jan 2021 18:44:39 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:64010 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728658AbhAOXoc (ORCPT ); Fri, 15 Jan 2021 18:44:32 -0500 Received: from grover.flets-west.jp (softbank126026094251.bbtec.net [126.26.94.251]) (authenticated) by conuserg-12.nifty.com with ESMTP id 10FNhKIC008447; Sat, 16 Jan 2021 08:43:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 10FNhKIC008447 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1610754202; bh=5hso9mkcyiBBIkZT6co7/OGxeCIo9O6ZtegLVDOCJeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a78FDuqmEAxUg6ebGpbe6NVe5s4ynkh+6nihokOEaGYyVczrL9pbxEMqUhzznNjD1 dNlTyUU8rZQV69PjGNLz36WbChS/pbiYjj3U1SU5qfoITbMHWsfeAjyeiwBKe63WaF IarcXF/6MmLTxc+4vCO5u0xB+FlNz8k28JCEd6rz1kqAFlrBSgIPuT8Q6h/aQwZrWh DQwKw8lxnZ4TYBnNqrljhHe9uMMgM3Xdhn9iyr8TDVQKyXeSc54snIa3Z8jH0qOuSG 1yBqh945rxfuECnku+MKzOrl70MYpp+okMNBUgaHkgR5Y6A9Xubdpkm4KCMWX9E2tK FeGBpD0Z9T+Sg== X-Nifty-SrcIP: [126.26.94.251] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Marco Elver , Nick Desaulniers , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] genksyms: remove useless case DOTS Date: Sat, 16 Jan 2021 08:43:04 +0900 Message-Id: <20210115234305.87205-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115234305.87205-1-masahiroy@kernel.org> References: <20210115234305.87205-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This switch statement does not list out all the cases. Since the 'default' covers all the rest, the 'DOTS' case is unneeded. Signed-off-by: Masahiro Yamada --- scripts/genksyms/lex.l | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l index 9cb075cf6a34..a4d7495eaf75 100644 --- a/scripts/genksyms/lex.l +++ b/scripts/genksyms/lex.l @@ -234,7 +234,6 @@ repeat: lexstate = ST_EXPRESSION; break; - case DOTS: default: APP; break;