From patchwork Wed Apr 5 21:09: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: 9665765 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 7C3CD602B5 for ; Wed, 5 Apr 2017 21:09:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CD7028113 for ; Wed, 5 Apr 2017 21:09:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61BBA28178; Wed, 5 Apr 2017 21:09:48 +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 1150828113 for ; Wed, 5 Apr 2017 21:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934282AbdDEVJr (ORCPT ); Wed, 5 Apr 2017 17:09:47 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34341 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933224AbdDEVJo (ORCPT ); Wed, 5 Apr 2017 17:09:44 -0400 Received: by mail-wr0-f196.google.com with SMTP id w43so6043424wrb.1 for ; Wed, 05 Apr 2017 14:09:43 -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=SUeK9bXgnj3b2pbMbBo4F8kvksICDhLpOIr7mguJahk=; b=Pb8JewKruftH/mDWTxeKb8m9wlTZBDr+SBBw29coxWrRHxtsOuZlBa+g4MSvzKRD7m OaOcLwRqGZbVTv60q0deoue/zOJMqyOUYdZC+TsfsYuISTEA9Qn26KGkhiCCPEJATSo2 M0Z9l9SA6H9ZXKkr0Vymm9bJ6SiTR0rvx95RLrfUWixCKHE8DRRLTouK9Mxd0aodykso joEj2f7u5ayuLzlC9mMA9VBMk1/TQQ6U3Wm5LXw9JP38igAz3wbSJCVWYMNs5PE5V1et e0Zlde4aMcL3Y4j6rr+LYcdgDIHGazG1XfJ5FyMANGaYyZq6vQmL+ISPOOVFQbPEQdyM ucFA== 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=SUeK9bXgnj3b2pbMbBo4F8kvksICDhLpOIr7mguJahk=; b=oQCFfutKAS0P7spsmCy8HXIDE089oFD3q8tvxghrvoRMCa8QZLhhiEbOHwiD6FD/gn maI8t/ocXjKGeDSK+haFB67XnzWO1oc59Pk3+KQwGeSVxAjckGR82N5HcEHmVibJLxHz WDkiE5+ooVm3KAkm9aqci6qBbvPrpqOnUDDib72TDuMXox31tt0VliLxtt0WJjBFlGu9 LzrpFCOKV95mH975vlCtvHvpoALqKzey4Mm4VPFgAgK3vKA5UuEkKJ4YEJdbt22yAQgu slwSUD2nmI47UWLW8PbA4jAXKMPG186/z/Tj8s9o8pTsdVX7Xq3EOc7ZaENX9qZCuPf1 cpLA== X-Gm-Message-State: AFeK/H2reaAKSVu6PilrM2yAFlpimmCUxFWlHNRcFb0UtmHsYx7YB5ZM Q6MHlsBsbDRijg== X-Received: by 10.28.109.93 with SMTP id i90mr20875510wmc.44.1491426582961; Wed, 05 Apr 2017 14:09:42 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:88d:1900:fc6c:1650:1726:93b6]) by smtp.gmail.com with ESMTPSA id v29sm27592168wrv.66.2017.04.05.14.09.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 14:09:42 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH 5/9] reorganize the definition of the modifiers Date: Wed, 5 Apr 2017 23:09:23 +0200 Message-Id: <20170405210927.27948-6-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170405210927.27948-1-luc.vanoostenryck@gmail.com> References: <20170405210927.27948-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 Now they are grouped a bit more logically. Note: MOD_ASSIGNED & MOD_ADDRESSABLE are not type modifiers but properties of the symbol. As such they should be moved to struct symbol. However, as they should be correctly propagated to the symbol components if any, better to leave them as is. Signed-off-by: Luc Van Oostenryck --- symbol.h | 65 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/symbol.h b/symbol.h index 5192cacd9..b6c777253 100644 --- a/symbol.h +++ b/symbol.h @@ -200,39 +200,38 @@ struct symbol { }; /* Modifiers */ -#define MOD_AUTO 0x0001 -#define MOD_REGISTER 0x0002 -#define MOD_STATIC 0x0004 -#define MOD_EXTERN 0x0008 - -#define MOD_CONST 0x0010 -#define MOD_VOLATILE 0x0020 -#define MOD_SIGNED 0x0040 -#define MOD_UNSIGNED 0x0080 - -#define MOD_CHAR 0x0100 -#define MOD_SHORT 0x0200 -#define MOD_LONG 0x0400 -#define MOD_LONGLONG 0x0800 -#define MOD_LONGLONGLONG 0x1000 -#define MOD_PURE 0x2000 - -#define MOD_TLS 0x20000 -#define MOD_INLINE 0x40000 -#define MOD_ADDRESSABLE 0x80000 - -#define MOD_NOCAST 0x100000 -#define MOD_NODEREF 0x200000 -#define MOD_TOPLEVEL 0x800000 // scoping.. - -#define MOD_ASSIGNED 0x2000000 -#define MOD_TYPE 0x4000000 -#define MOD_SAFE 0x8000000 // non-null/non-trapping pointer - -#define MOD_USERTYPE 0x10000000 -#define MOD_NORETURN 0x20000000 -#define MOD_EXPLICITLY_SIGNED 0x40000000 -#define MOD_BITWISE 0x80000000 +#define MOD_AUTO 0x00000001 +#define MOD_REGISTER 0x00000002 +#define MOD_STATIC 0x00000004 +#define MOD_EXTERN 0x00000008 +#define MOD_TOPLEVEL 0x00000010 // scoping.. +#define MOD_TLS 0x00000020 +#define MOD_INLINE 0x00000040 + +#define MOD_ASSIGNED 0x00000080 +#define MOD_ADDRESSABLE 0x00000100 + +#define MOD_CONST 0x00000200 +#define MOD_VOLATILE 0x00000400 + +#define MOD_SIGNED 0x00002000 +#define MOD_UNSIGNED 0x00004000 +#define MOD_EXPLICITLY_SIGNED 0x00008000 + +#define MOD_TYPE 0x00010000 +#define MOD_USERTYPE 0x00020000 +#define MOD_CHAR 0x00040000 +#define MOD_SHORT 0x00080000 +#define MOD_LONG 0x00100000 +#define MOD_LONGLONG 0x00200000 +#define MOD_LONGLONGLONG 0x00400000 + +#define MOD_SAFE 0x00800000 // non-null/non-trapping pointer +#define MOD_PURE 0x01000000 +#define MOD_BITWISE 0x02000000 +#define MOD_NOCAST 0x04000000 +#define MOD_NODEREF 0x08000000 +#define MOD_NORETURN 0x10000000 #define MOD_NONLOCAL (MOD_EXTERN | MOD_TOPLEVEL)