From patchwork Wed Aug 23 20:15:23 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: 9918273 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 3E452602CB for ; Wed, 23 Aug 2017 20:16:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30F3028A2C for ; Wed, 23 Aug 2017 20:16:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2604F28A2E; Wed, 23 Aug 2017 20:16:36 +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 BA4DF28A2C for ; Wed, 23 Aug 2017 20:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932679AbdHWUQf (ORCPT ); Wed, 23 Aug 2017 16:16:35 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:38796 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932443AbdHWUQe (ORCPT ); Wed, 23 Aug 2017 16:16:34 -0400 Received: by mail-wm0-f68.google.com with SMTP id a70so623562wmd.5 for ; Wed, 23 Aug 2017 13:16:34 -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=yEZCTXxnECeSWQB31UZ4S4puDqyhzHsbyY89f2KQyeA=; b=hFTn4zKTWmQ2R7icTl/XFJ3SFg4KUFyCfv1uu3441i1RDDK2TkNe67v2Vm2swrka2G aScauAw/Az43TnLWNCISVAKJHyhxEtTSxWoF0lkorWuc9fOJ7ZQdDXApSYq/O+5ucjuz TlZR7fNjgzgde0cei93kj89QswicIJ+yfMPaw5/p18q7ymZ0PWZdnj0L1CFVvbjixEMR /nBly1R7gW1bnLGUOdTBbvqs8qFPf7isfCsTaS91Iem1VvQFJH/8G0MxaewhR2p7hJM7 cYo529mtGaXOl7Bxjm9LrYsuf2G+rKDuad72kZxDhA86A4JoSsR6dq260kXYgxwTLwzB hJ9g== 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=yEZCTXxnECeSWQB31UZ4S4puDqyhzHsbyY89f2KQyeA=; b=P4gCs5AxkW92aLwj1IDvpsxTD3/zi1qQFNDessK86Y4gZMe33rjvGWqLTDHxqby/2y OPQsX/bmOuocwvDyyb/tZa2MDFtUF+H823zJHzC6iyDiGzzc0HosINm83tkjRA6FYarp E6vCakMRJEVOpSVTsQHdz1tl2glRvRLJa2nCDkZHUNfjR0WGprSgXYhiye3oCUBURTHI ikRb8o6KwO0uUB2oYhM9zSNPXqMCtCXNBOxImNJkVwNmwAfgJAUSm8Uhcs9fsTGVvseT c9SjTCc8mR+oIXNBpZ+l/F/hAF1ssn83vf6mhYGthYYczf4n00y1ypCG2aWq0lWJ1d1P Xe8g== X-Gm-Message-State: AHYfb5gw9QxTpD8aDkRo4T1G7d4OiHJjWIqOeWwM7YHlC8PWbiCFrmp8 T/EMLKyL2Fqk8dRiTUI= X-Received: by 10.80.178.70 with SMTP id o64mr3996872edd.185.1503519393331; Wed, 23 Aug 2017 13:16:33 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4076:600:9020:103b:7912:3a40]) by smtp.gmail.com with ESMTPSA id e29sm1183374edd.88.2017.08.23.13.16.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 13:16:32 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [RFC PATCH 17/48] dump-ir: rename -fdump-linearize to -fdump-ir Date: Wed, 23 Aug 2017 22:15:23 +0200 Message-Id: <20170823201554.90551-18-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170823201554.90551-1-luc.vanoostenryck@gmail.com> References: <20170823201554.90551-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 --- cgcc | 2 +- lib.c | 10 +++++----- lib.h | 2 +- linearize.c | 4 ++-- sparse.1 | 2 +- validation/linear/bitfield-init-mask.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cgcc b/cgcc index a8d7b4f21..644627109 100755 --- a/cgcc +++ b/cgcc @@ -103,7 +103,7 @@ sub check_only_option { my ($arg) = @_; return 1 if $arg =~ /^-W(no-?)?(address-space|bitwise|cast-to-as|cast-truncate|context|decl|default-bitfield-sign|designated-init|do-while|enum-mismatch|init-cstring|memcpy-max-count|non-pointer-null|old-initializer|one-bit-signed-bitfield|override-init-all|paren-string|ptr-subtraction-blows|return-void|sizeof-bool|sparse-all|sparse-error|transparent-union|typesign|undef|unknown-attribute)$/; return 1 if $arg =~ /^-v(no-?)?(entry|dead)$/; - return 1 if $arg =~ /^-f(dump-linearize|memcpy-max-count)(=\S*)?$/; + return 1 if $arg =~ /^-f(dump-ir|memcpy-max-count)(=\S*)?$/; return 0; } diff --git a/lib.c b/lib.c index c46798d0f..a0ed29c3e 100644 --- a/lib.c +++ b/lib.c @@ -258,7 +258,7 @@ int dbg_entry = 0; int dbg_dead = 0; int fmem_report = 0; -int fdump_linearize; +int fdump_ir; unsigned long long fmemcpy_max_count = 100000; int preprocess_only; @@ -724,12 +724,12 @@ static char **handle_switch_ftabstop(char *arg, char **next) static char **handle_switch_fdump(char *arg, char **next) { - if (!strncmp(arg, "linearize", 9)) { - arg += 9; + if (!strncmp(arg, "ir", 2)) { + arg += 2; if (*arg == '\0') - fdump_linearize = 1; + fdump_ir = 1; else if (!strcmp(arg, "=only")) - fdump_linearize = 2; + fdump_ir = 2; else goto err; } diff --git a/lib.h b/lib.h index 307ccaeb2..ccac27d0b 100644 --- a/lib.h +++ b/lib.h @@ -151,7 +151,7 @@ extern int dbg_entry; extern int dbg_dead; extern int fmem_report; -extern int fdump_linearize; +extern int fdump_ir; extern unsigned long long fmemcpy_max_count; extern int arch_m64; diff --git a/linearize.c b/linearize.c index 6cf97a42e..85acfd9c1 100644 --- a/linearize.c +++ b/linearize.c @@ -2262,8 +2262,8 @@ static struct entrypoint *linearize_fn(struct symbol *sym, struct symbol *base_t add_one_insn(ep, insn); } - if (fdump_linearize) { - if (fdump_linearize == 2) + if (fdump_ir) { + if (fdump_ir == 2) return ep; show_entry(ep); } diff --git a/sparse.1 b/sparse.1 index b79c58767..c7ad4483b 100644 --- a/sparse.1 +++ b/sparse.1 @@ -357,7 +357,7 @@ normalized GNU triplet. (e.g. i386-linux-gnu). . .SH DEBUG OPTIONS .TP -.B \-fdump-linearize[=only] +.B \-fdump-ir[=only] Dump the IR code of a function directly after its linearization, before any simplifications is made. If the argument \fB=only\fR is also given no further processing is done on the function. diff --git a/validation/linear/bitfield-init-mask.c b/validation/linear/bitfield-init-mask.c index 94afa400c..f43605855 100644 --- a/validation/linear/bitfield-init-mask.c +++ b/validation/linear/bitfield-init-mask.c @@ -18,7 +18,7 @@ struct bfu bfu_init_20_23(int a) /* * check-name: bitfield initializer mask - * check-command: test-linearize -fdump-linearize=only -Wno-decl $file + * check-command: test-linearize -fdump-ir=only -Wno-decl $file * check-output-ignore * * check-output-contains: and\\..*fffff800\$