From patchwork Wed Aug 23 20:15:26 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: 9918279 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 CA6DD602CB for ; Wed, 23 Aug 2017 20:16:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD95828A2C for ; Wed, 23 Aug 2017 20:16:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B29A528A2E; Wed, 23 Aug 2017 20:16:40 +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 676BF28A2C for ; Wed, 23 Aug 2017 20:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932683AbdHWUQk (ORCPT ); Wed, 23 Aug 2017 16:16:40 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33698 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932565AbdHWUQj (ORCPT ); Wed, 23 Aug 2017 16:16:39 -0400 Received: by mail-wm0-f68.google.com with SMTP id b79so662357wmf.0 for ; Wed, 23 Aug 2017 13:16:39 -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=J+mQifK2nLa5IYkSP537SByYp7BWcXHEtogIaDytOQs=; b=JC0GcsZiEokCG6uIs/TIaDPANOLexCj9Pq5OrwpBR3wwUrDMEZ3/8PF50ouoWvBIL7 LYvY3JDAbpqddn6GqJAwni5fMn6LF3aznGXeSABCCYfhVPf7I998wpayGCWObLozoion Np8Lf1NYHq0hkwLqqVdSfqIJq4asFQf+kgnFSpiZFM0C+43tjvMsXSNKn3Q+3Fu5BOF0 xybvzCfdB6UW2KnHbmOJG1eLD9iWouIm8Fx/1flMzrnNVWIAToqwQdWpANpBRGT6olC7 sKEgKFYJFy4bO3rX27lHieu6toeU/OjWtA7LYVN1IZDm1Y9Fp4CWDcpKL6SNINiysyAn yyIg== 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=J+mQifK2nLa5IYkSP537SByYp7BWcXHEtogIaDytOQs=; b=TwrpqiBWvlPu4NixbpC2txVwQsPGdKeBPafgkw3MN2SVnHTzfMShsEZNxe2hhSpUHl XXdwjYhiyUaaV+Hcce4mebxNbdaj+N/2WJEh2yf0sH3mRNnUI7zlgKcscVA1UZamDYPr tf991y0ctJVLeZ+w5b/wxM7fkNSDToC6pIGlkpVU6tTThA7+bVeTpHQ9NKr/sVSfkcMU oIIHWE62FZCiziUA2uL8LMAk6ORWEbZ1j8tN986MpQF8pvuJ2ciYjvPt9UMslkDLCPve Rh+4NTkQbAPhqipIPIHqH+yfyr29UMyzvgpvXlXo8jEKm/PtOgu6LX3dCqLwGpdxlMr6 C1qQ== X-Gm-Message-State: AHYfb5gm/+w+JGVyJ99xnZuqTzONqVxfqeUTiU0ka09orHaA8P6jCyC5 tx1aurRe6/s5qq8IRk0= X-Received: by 10.80.168.34 with SMTP id j31mr3977511edc.87.1503519398252; Wed, 23 Aug 2017 13:16:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 13:16:37 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [RFC PATCH 20/48] dump-ir: make it more flexible Date: Wed, 23 Aug 2017 22:15:26 +0200 Message-Id: <20170823201554.90551-21-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 --- lib.c | 17 +++++++++-------- validation/linear/bitfield-init-mask.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib.c b/lib.c index c107505a7..d3aaf10d2 100644 --- a/lib.c +++ b/lib.c @@ -490,7 +490,6 @@ static unsigned long lookup_mask(const char *name, const struct mask_map *map) return 0; } -inline static unsigned long handle_suboption_mask(char *arg, const struct mask_map *map) { const char *token; @@ -757,16 +756,18 @@ static char **handle_switch_ftabstop(char *arg, char **next) return next; } +static const struct mask_map dump_ir_options[] = { + { "$default", DUMP_IR_LINEARIZE }, + { "linearize", DUMP_IR_LINEARIZE }, + { "only", DUMP_IR_ONLY }, + { }, +}; + static char **handle_switch_fdump(char *arg, char **next) { if (!strncmp(arg, "ir", 2)) { - fdump_ir = DUMP_IR_LINEARIZE; - arg += 2; - if (*arg == '\0') - fdump_ir = DUMP_IR_LINEARIZE; - else if (!strcmp(arg, "=only")) - fdump_ir |= DUMP_IR_ONLY; - else + fdump_ir = handle_suboption_mask(arg+2, dump_ir_options); + if (fdump_ir == ~0UL) goto err; } diff --git a/validation/linear/bitfield-init-mask.c b/validation/linear/bitfield-init-mask.c index f43605855..fa91fec90 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-ir=only -Wno-decl $file + * check-command: test-linearize -fdump-ir=linearize,only -Wno-decl $file * check-output-ignore * * check-output-contains: and\\..*fffff800\$