From patchwork Mon Mar 27 14:19:15 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: 9646889 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 469BA602C8 for ; Mon, 27 Mar 2017 14:23:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3774E28414 for ; Mon, 27 Mar 2017 14:23:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 299092840E; Mon, 27 Mar 2017 14:23:50 +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 C20A8283E8 for ; Mon, 27 Mar 2017 14:23:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753015AbdC0OXb (ORCPT ); Mon, 27 Mar 2017 10:23:31 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33552 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753489AbdC0OV5 (ORCPT ); Mon, 27 Mar 2017 10:21:57 -0400 Received: by mail-wr0-f193.google.com with SMTP id 20so13746457wrx.0 for ; Mon, 27 Mar 2017 07:21:41 -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=y1I7of84ZtNk3rxC5b9pBOKSG8I7NOHVzv3d4dKiI0I=; b=ule4OvPZwzvaid9/cHjuNWq0AhMxtt/9FcrnelpAklnob59O7Z9l2z8ahAPPIUuE60 vK4Z0j9N9Ql/A9PijzPpAZnJRdFNuOl2XZRxsPa4htQfkHEsoqbDLi5LIfj7GFoVIe7V 0tvhSjExb1g0g6Fwt3177RwXLaK32IDPyiPtKdzSxGafyDnKlc5ZxFCNESVUABd819UW ERioBRuVxOC7g4qUJBswFAR1XSprBKzK2aQLLZQ1QJSsS2O31JTG8LRgzw2fOHuF3hrn ODHlb/nNkRxWW5ZQoNsX+7uIGCPY9N4gVOHXULDb7jUkvam7kFaHRUzwUtMaU4VzKdUZ PO1Q== 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=y1I7of84ZtNk3rxC5b9pBOKSG8I7NOHVzv3d4dKiI0I=; b=NFv4EKlrCed78304pAt8ipq5i2W2kdU65fbfliIIjIlxEg/IUA8uBa+F6bsumZ1b1J C1LV09gUnGn2TxwkJCMx8KZNyPFMm6BA6CpWmL33wU3g37tr2njMOK8Y9KPUJ9vgtZV1 kfDolv+I/v/chnsaO3DJWimzd1V1SXxNsHm6PfPLkaGUu+Smyx4tjYLEaNjowoSt/+D6 1+hJwdnO+SGTFe3JA1jm6Y7sKZj/es+LsJsBusyXWHspwN5+G2NFtDgOyzdd4P19olki Ken9IOFaXmenJnqHOYQ+gGvo4e8Ts3nVyM/HAsRGEQwvvvZTfww7KZqKqsxDRJVg/Wsd fhDw== X-Gm-Message-State: AFeK/H2qG5vh8P8pCB6B2CQtpZvItHAgL+yLNYMJXv/BO17zGrRx3uvu6TOmYHcPsYh9eg== X-Received: by 10.223.135.143 with SMTP id b15mr21449136wrb.16.1490624486976; Mon, 27 Mar 2017 07:21:26 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:496:ae63:aebb:a034]) by smtp.gmail.com with ESMTPSA id w99sm936925wrb.3.2017.03.27.07.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 07:21:26 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Ramsay Jones , Christopher Li , Luc Van Oostenryck Subject: [PATCH 2/5] predefine __INT_MAX__ and friends Date: Mon, 27 Mar 2017 16:19:15 +0200 Message-Id: <20170327141918.61151-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170327141918.61151-1-luc.vanoostenryck@gmail.com> References: <20170327141918.61151-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 Some tests or some code depends on these macros being predefined by the compiler. Predefine them. Signed-off-by: Luc Van Oostenryck --- lib.c | 23 ++++++++++++++++++----- validation/preprocessor/predef-max.c | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 validation/preprocessor/predef-max.c diff --git a/lib.c b/lib.c index 272d2c88a..4e6e6acd6 100644 --- a/lib.c +++ b/lib.c @@ -827,15 +827,28 @@ static char **handle_switch(char *arg, char **next) return next; } -static void predefined_macros(void) +static void predefined_sizeof(const char *name, unsigned bits) { - unsigned long long val; + add_pre_buffer("#weak_define __SIZEOF_%s__ %d\n", name, bits/8); +} +static void predefined_type_size(const char *name, const char *suffix, unsigned bits) +{ + unsigned long long max = (1ULL << (bits - 1 )) - 1; + + add_pre_buffer("#weak_define __%s_MAX__ %#llx%s\n", name, max, suffix); + predefined_sizeof(name, bits); +} + +static void predefined_macros(void) +{ add_pre_buffer("#define __CHECKER__ 1\n"); - val = (1ULL << (bits_in_long-1)) - 1; - add_pre_buffer("#weak_define __LONG_MAX__ %#llxLL\n", val); - add_pre_buffer("#weak_define __SIZEOF_POINTER__ %d\n", bits_in_pointer/8); + predefined_type_size("INT", "", bits_in_int); + predefined_type_size("LONG", "L", bits_in_long); + predefined_type_size("LONG_LONG", "LL", bits_in_longlong); + + predefined_sizeof("POINTER", bits_in_pointer); } void declare_builtin_functions(void) diff --git a/validation/preprocessor/predef-max.c b/validation/preprocessor/predef-max.c new file mode 100644 index 000000000..ad4b7eaf1 --- /dev/null +++ b/validation/preprocessor/predef-max.c @@ -0,0 +1,18 @@ +#define TEST_MAX(X, Z) if (X != ((~ Z) >> 1)) return 1 + +int test_max(void) +{ + TEST_MAX(__INT_MAX__, 0U); + TEST_MAX(__LONG_MAX__, 0UL); + TEST_MAX(__LONG_LONG_MAX__, 0ULL); + + return 0; +} + +/* + * check-name: predefined ___MAX__ + * check-command: test-linearize -Wno-decl $file + * check-output-ignore + * + * check-output-contains: ret\\..*\\$0 + */