From patchwork Wed Dec 12 16:45:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10726711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2BBF91E for ; Wed, 12 Dec 2018 16:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B37102B82E for ; Wed, 12 Dec 2018 16:46:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A807B2B835; Wed, 12 Dec 2018 16:46:08 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 318212B82B for ; Wed, 12 Dec 2018 16:46:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727899AbeLLQqI (ORCPT ); Wed, 12 Dec 2018 11:46:08 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:44111 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727681AbeLLQqH (ORCPT ); Wed, 12 Dec 2018 11:46:07 -0500 Received: by mail-ed1-f67.google.com with SMTP id y56so16082085edd.11 for ; Wed, 12 Dec 2018 08:46:06 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=qTYffhjRRYNc/NiTXifag1prns+ixVSbqKrRpHSI344=; b=jn1lt6lhWtro/DNi2IFH/Vi3gFQj+IPbK5rZ8QRsqwu4LayItoPXFbTJXBxou7Y9hE zQ1lZJmedwBkV+VhufYfOflDsYcREiqhPqO42RkO7AxVwjt28ZezgdXcVBmMIjjmQuOR DCg/sCVAR1RleIfKTGJSVGqjdB+UFYeDNZRIg7FN1t7KUs7Xtx/F+QdRap2O5ZQh8w1F mwONgtqMaKFjhUgTG4fToh8uXjUoYTiP7zmZDjTOSdYNEZjZ3gJcdR795wwtYrJkH24D bnQ4baisQZM8EZW/buOlZQeGwzbOLOqrtDV5XKaXXYZq/1QfCdHEtYEbfAb7ECPyVWM3 QuEA== 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:mime-version:content-transfer-encoding; bh=qTYffhjRRYNc/NiTXifag1prns+ixVSbqKrRpHSI344=; b=ZBPgiOcEcWJdGEbrypgNgxRNyzD9j9FNJXDRQdv44/oPQ1Po+lRO7qXodAej4fNVKq FX4eZxmPPGstgxYfm+YW72xB38DkEtsvTMbM2B2xL6d9v8wmtsPPJ95pmQHiq/WUGlCS MtMIStQZORhF5O/SmFqx+0ij49ua1B2rw5DywBAWIVhIcy+wwDk4hN8xk1yMlu+72lkF ePu2p1VeBxBY4sISNnzjtyS3bR1Dr45ylhexPWeeM5QuP3fIDMNhePm04FUaT1wrqW/8 yCK4p5JAlg/DSTX2dfrOSshNkJfhvJfXxcRP/knRNVgiumB5dS6U37gaD+0pEGjTRU2C ZxOQ== X-Gm-Message-State: AA+aEWaboXYkGBQhfLlSOiF4fwdZKyi5Ef0ZN6GJGej3SjAm1viki5tQ Ow15F/IX2CzOT7OYtdLTnMvcBxXE X-Google-Smtp-Source: AFSGD/XANMkWJugxnSR/Eb6MaI3Po7eUfZknlbXNPk8vZwSbY96bo4DkwVeiKRNU4v8LS7w3BhyHxQ== X-Received: by 2002:a17:906:2496:: with SMTP id e22-v6mr15666464ejb.84.1544633165090; Wed, 12 Dec 2018 08:46:05 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:4011:9300:57c:c634:5c6d:4b28]) by smtp.gmail.com with ESMTPSA id v11sm5161716edy.49.2018.12.12.08.46.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 08:46:04 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Ramsay Jones , Luc Van Oostenryck Subject: [PATCH v2 06/14] make predefined_type_size() more generic Date: Wed, 12 Dec 2018 17:45:46 +0100 Message-Id: <20181212164554.43133-7-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181212164554.43133-1-luc.vanoostenryck@gmail.com> References: <20181212164554.43133-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.0 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 This allows to have a single function to output the size, the type, the maximal value, ... Signed-off-by: Luc Van Oostenryck --- lib.c | 61 ++++++++++++++++++++------------ validation/preprocessor/predef.c | 3 ++ 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/lib.c b/lib.c index ad583da93..89126fb57 100644 --- a/lib.c +++ b/lib.c @@ -1145,6 +1145,15 @@ static char **handle_switch(char *arg, char **next) return next; } +#define PTYPE_SIZEOF (1U << 0) +#define PTYPE_T (1U << 1) +#define PTYPE_MAX (1U << 2) +#define PTYPE_MIN (1U << 3) +#define PTYPE_WIDTH (1U << 4) +#define PTYPE_TYPE (1U << 5) +#define PTYPE_ALL (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH) +#define PTYPE_ALL_T (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH|PTYPE_T) + static void predefined_sizeof(const char *name, const char *suffix, unsigned bits) { char buf[32]; @@ -1163,26 +1172,37 @@ static void predefined_width(const char *name, unsigned bits) static void predefined_max(const char *name, const char *suffix, unsigned bits) { - unsigned long long max = bits_mask(bits - 1); + unsigned long long max = bits_mask(bits); char buf[32]; snprintf(buf, sizeof(buf), "__%s_MAX__", name); predefine(buf, 1, "%#llx%s", max, suffix); } -static void predefined_type_size(const char *name, const char *suffix, unsigned bits) -{ - predefined_max(name, suffix, bits); - predefined_sizeof(name, "", bits); - predefined_width(name, bits); -} - static void predefined_type(const char *name, struct symbol *type) { const char *typename = builtin_typename(type); add_pre_buffer("#weak_define __%s_TYPE__ %s\n", name, typename); } +static void predefined_ctype(const char *name, struct symbol *type, int flags) +{ + unsigned bits = type->bit_size; + + if (flags & PTYPE_SIZEOF) { + const char *suffix = (flags & PTYPE_T) ? "_T" : ""; + predefined_sizeof(name, suffix, bits); + } + if (flags & PTYPE_MAX) { + const char *suffix = builtin_type_suffix(type); + predefined_max(name, suffix, bits - is_signed_type(type)); + } + if (flags & PTYPE_TYPE) + predefined_type(name, type); + if (flags & PTYPE_WIDTH) + predefined_width(name, bits); +} + static void predefined_macros(void) { predefine("__CHECKER__", 0, "1"); @@ -1224,27 +1244,24 @@ static void predefined_macros(void) break; } - predefined_sizeof("SHORT", "", bits_in_short); - predefined_max("SHRT", "", bits_in_short); - predefined_width("SHRT", bits_in_short); - predefined_max("SCHAR", "", bits_in_char); - predefined_width("SCHAR", bits_in_char); predefined_sizeof("WCHAR", "_T", bits_in_wchar); predefined_max("WCHAR", "", bits_in_wchar); predefined_width("WCHAR", bits_in_wchar); predefine("__CHAR_BIT__", 1, "%d", bits_in_char); - 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_ctype("SHORT", &short_ctype, PTYPE_SIZEOF); + predefined_ctype("SHRT", &short_ctype, PTYPE_MAX|PTYPE_WIDTH); + predefined_ctype("SCHAR", &char_ctype, PTYPE_MAX|PTYPE_WIDTH); + + predefined_ctype("INT", &int_ctype, PTYPE_ALL); + predefined_ctype("LONG", &long_ctype, PTYPE_ALL); + predefined_ctype("LONG_LONG", &llong_ctype, PTYPE_ALL); predefined_sizeof("INT128", "", 128); - predefined_sizeof("SIZE", "_T", bits_in_pointer); - predefined_width( "SIZE", bits_in_pointer); - predefined_sizeof("PTRDIFF", "_T", bits_in_pointer); - predefined_width( "PTRDIFF", bits_in_pointer); - predefined_sizeof("POINTER", "", bits_in_pointer); + predefined_ctype("PTRDIFF", ssize_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); + predefined_ctype("SIZE", size_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); + predefined_ctype("POINTER", &ptr_ctype, PTYPE_SIZEOF); predefined_sizeof("FLOAT", "", bits_in_float); predefined_sizeof("DOUBLE", "", bits_in_double); @@ -1276,8 +1293,6 @@ static void create_builtin_stream(void) // Temporary hack add_pre_buffer("#define _Pragma(x)\n"); - predefined_type("SIZE", size_t_ctype); - /* add the multiarch include directories, if any */ if (multiarch_dir && *multiarch_dir) { add_pre_buffer("#add_system \"/usr/include/%s\"\n", multiarch_dir); diff --git a/validation/preprocessor/predef.c b/validation/preprocessor/predef.c index ccb5d3619..298bdd93c 100644 --- a/validation/preprocessor/predef.c +++ b/validation/preprocessor/predef.c @@ -17,6 +17,8 @@ int test(void) TEST_SMAX(INT, int); TEST_SMAX(LONG, long); TEST_SMAX(LONG_LONG, long long); + TEST_SMAX(PTRDIFF, __PTRDIFF_TYPE__); + TEST_UMAX(SIZE, __SIZE_TYPE__); #define TEST_SIZEOF(X, T) if (__SIZEOF_ ## X ## __ != sizeof(T)) return 1 TEST_SIZEOF(SHORT, short); @@ -24,6 +26,7 @@ int test(void) TEST_SIZEOF(LONG, long); TEST_SIZEOF(LONG_LONG, long long); TEST_SIZEOF(INT128, __int128); + TEST_SIZEOF(PTRDIFF_T, __PTRDIFF_TYPE__); TEST_SIZEOF(SIZE_T, __SIZE_TYPE__); TEST_SIZEOF(POINTER, void*); TEST_SIZEOF(FLOAT, float);