From patchwork Wed May 5 23:45:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 1474686 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=R2nIDIhe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbCyP08xZz9rx6 for ; Thu, 6 May 2021 09:45:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38FEC386185D; Wed, 5 May 2021 23:45:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38FEC386185D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620258342; bh=v112sB5oTh/pef2lvK421lCJ8O96o71DaiYyboCZAa0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=R2nIDIheVdgIW/1QkXP70XcZ/X8bc8kw5WHmmQG0Gr1xC1Z0jZcswhOt8uxZ8SOnL JZ/RGpKKV/vRJ0Azt0W5DXJ1n9rshf21QEQaNjhqfyHvz4EfeyR8l/NE53borjSUp5 oiuNkK3jDGmwrPFKAm5XQkczCFJJQbIiLRSlcgdM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by sourceware.org (Postfix) with ESMTPS id 371B53857C40 for ; Wed, 5 May 2021 23:45:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 371B53857C40 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 145Ni5kN095493 for ; Wed, 5 May 2021 23:45:38 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 38beetke4d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 05 May 2021 23:45:38 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 145NfRcN144985 for ; Wed, 5 May 2021 23:45:37 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2043.outbound.protection.outlook.com [104.47.51.43]) by aserp3030.oracle.com with ESMTP id 38bewrm885-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 05 May 2021 23:45:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j5poty/rvThLXh5GTcYp5EQUwvWVnhlcfuPH48T0jLNeGMOqhbzvkBahyIHmU/kOYUQsK+aQslj0rJKwF2g4CG3q0hxqPtEeEnuctPbYjQ+Li8k7IlgKgm7HKEUC9DcD1RpL09st+Ap300v7lGHZ+M/lp9zpcGqI/3psDA8+2tN1IHHRarR/A4dhNh17PRHrNjD7eh7lzvDyT6VMGBV9RJbBlOTmlsPfD+wIJ4v97pJd1KhMaXMdE6tti7+2clhow9T2HPnbKTJS7ILdLAs7h4nOLeFY5gWP6lewpTadmYPWDi45lqoYDbXnDPAFeEdEDGmOXtuJaOaMI0H1TevEXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v112sB5oTh/pef2lvK421lCJ8O96o71DaiYyboCZAa0=; b=T904/PZakAEYfK73BxVlEIp5GHqNQgrWGLo5f/vC6SN+/xXNyO5O8DeR3gYA8pQopWC0yTQo62cb2SUmz4gL1lXwxsOubhnXW3YySdQon1WPKUvI8LZiB4K4I4LUdSaocwxmPmlcIVL58kvIzJZkuum/W8LMQJhYJL2RzL+SDXJCv8CkampvlN1DDMzi8YGFW91ujHSA7sxWzn/KPOLc9Rae+3dA3Z1rzdC9ftoJ6HMiPcNaatj70z76R2ZN47oJwExdNnOkV3z0FO3wZRbz+EKOLdrQdcQDzdWQ7sIHikRoVJS3FCLFD/57IudDJFDnY5JZKieVMqyk/+iWnAM+tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by MWHPR1001MB2398.namprd10.prod.outlook.com (2603:10b6:301:2f::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.20; Wed, 5 May 2021 23:45:34 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::38f0:2cf9:7238:9ffa]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::38f0:2cf9:7238:9ffa%6]) with mapi id 15.20.4065.037; Wed, 5 May 2021 23:45:34 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] opts: change write_symbols to support bitmasks Date: Wed, 5 May 2021 16:45:26 -0700 Message-Id: <1620258327-940-2-git-send-email-indu.bhagat@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1620258327-940-1-git-send-email-indu.bhagat@oracle.com> References: <1620258327-940-1-git-send-email-indu.bhagat@oracle.com> X-Originating-IP: [24.80.24.133] X-ClientProxiedBy: MW4PR03CA0039.namprd03.prod.outlook.com (2603:10b6:303:8e::14) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ibhagatpc.hitronhub.home (24.80.24.133) by MW4PR03CA0039.namprd03.prod.outlook.com (2603:10b6:303:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Wed, 5 May 2021 23:45:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e229ea8b-f6ce-4a35-9ef2-08d9101fe076 X-MS-TrafficTypeDiagnostic: MWHPR1001MB2398: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2N+/T0wQa3I7A4+HAKOdAWJMBx+52iIoSS7bZhtMxvghSmMH+KiZDD0U21mlLkgpivQG1Sd0oqvzMw2aivNkCMQwRZXG6q+b518J9GcZMYadKw4Y7iNo0SzbnoXvHONe+MPEPxu+KT6ivKlmisLuZprm7yGnbFgCeevx/xAiBBMosoOjJGuAh+nymuIfmMJGufvzGVmvLp+jjSKJOEh2dOG6dKNsxndrRxbUb/Fb5PuYMlPzrD4Ya7STfDnXhVlwX22TZBgQl8zhzfMQxQv7fTSsVZxC/+YNaTyMyOgY0/U0KfVLMpcAHnwEF5POiMQV4cSZY8L3m9ZYaTQcITeX2IO2qo987q98OQNZJLXmLqIP5o6nqRzoaXy+7iT9FTzTeuXXuZdox68N4edxjQa1N9s1VfC2UliwX0yZSCnKcAuOSpbqophr7vGy+RkgUlrIv2i4NzHJg1sVXjkOc6/TZHzWYytRP+Gk2z/W3scV50zk5ONzVqZEdp4yK87DIcZuE4yp7gNIFL7ItjxGHsSYk4sltnmiJat1jxDTnaZFqU7iPqo87A6Vl/er+5Mggc+HU75H325AgneXCK4eCc95O/ZeLi/i2n4tPthhgrD51OlthAtS6/8pQRR+b5MGkRgA/3BLnIhRvEY8y9wVB7DvAg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(39860400002)(376002)(346002)(366004)(396003)(36756003)(26005)(86362001)(6666004)(8936002)(30864003)(8676002)(66946007)(478600001)(6916009)(2616005)(38350700002)(956004)(6486002)(83380400001)(186003)(66476007)(316002)(66556008)(2906002)(5660300002)(6512007)(44832011)(6506007)(38100700002)(16526019)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YNe0rpb1nwJYR3DPcX8V9PDhk+dO+Q33FJv1Jb/WLfrzrYexGxhG+DAoQLvzg3Q9IpiYekPrp73zrXWKjkDLlg0Hf/rNfd4BKrXY/X0n6Gm5Eg+YJmbBlMuO05aNTYJn+zU9yW3XMXXmcg5jOSRRmRnkHPx2av1837s0WYZcTuUgZSrDyCnJnCoRJ4nqAOiNVc+5yLsPY5Hcsw4n/IAYnXwd5bzuxca7+0D0XOD7//eLPLzuade6V/j4U7BOcGstRog47GTOAdNQQd3NGLpRbQg9EYn2K3xtD9vx2l3lCzB4T2ym7RoHUPQDu6gu8kYqJkZylxZSHxgxhs5ojHGXE/nhDy3Yr5UBH7hBEzi6oR7QtL+HecbknUDYWzKhDLPJ98rhZv4M6ktVuCvgyvc54jPB/hF7Xip1GQmAWktyns6OM3FfJv5cPMZpZ+Px/WYBGuMZwGQWyqnxNtcREgniQ50HXZB+eNKbk7TaDXC8LkjBb4SB3yzzOWEafimda2z6hiEoeliMYsgI8Ax/7XJQafrdtp7MKdqIJ08mTvXEM7D6CmytbvzC7f0VH19yGELOorrF8YFHytlEbh2d1movxliB9vK6OLQXKojJMxO9OG842KOkH5/NJxB+irvRc2ymSrluvsolSYNJmIrwIYyx02s29dz/qGHu3/31+e4u26GGEMvD+4fh2TbTYHu1tdXdCuVK9to0woJtZRxjgdTpDZurUTmrcvsjMEZrdtVaMlQV4abzyP7p7i0cX6+JdxtolENDaUtUJQuTA3ctMssGlWXceN4g7YzECG6CNaeywtLfHPLvGSPiLYZsxKp2GZstQR/TAfQv26f3hQkwtdFLb1DOY5zXdZgAFuKHeP3n1GHV+8rsuOBs/bP2QC07TBnpSHEdxbnAOdj3x0ScDulWatoPvhlNE1xBmItJr/KKsKjrdU7zcTf8mwXhXZ0Da5+sukHkydddmf07Lg8EdzLZtwXDGS55H73zMi5ZHNDb3Nfha2uPgiPL+g0OiDR+nM//9p54Hq8njK6NMI4IQBflNtKyJ0f04bbQ1oe4Msa9YUKtNIryuBgaQoG9qOq3xnQFr3+dNFfMCAKApC92Vvz+mQ5C7310QOEj4mAjM4t5BoFMqal+MsnnbayMvlpzf1WzXXW9XRBt6jVoN32IzPPjjvaH/pT9eTjvNebzRteoyAq+aBc74dJJ6GL59VmjI1QicRBYtN86GYCUD9J+oWnW7l6YtIDP/T1Diq5usHGEVAz1u4EtKC9+WvKHVmydoHVygRg0Kn6zD0QMg4uiE/c+zDhS+mDKzkcCoZTFcjhkcmnBTSlaOP5dLygOXWGC65a8 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e229ea8b-f6ce-4a35-9ef2-08d9101fe076 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 23:45:34.6885 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7mpQcQteeYQJIR8T4k9rUCZ9avICbXIp5/OFAtHzhMEBq+F0JB7E73Olxy42so6MQzSw9qxCF0FGDzPlP3QOQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2398 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9975 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2105050165 X-Proofpoint-GUID: bCmp8jy28IMcdP3iBZoYBdEpc15N_YHX X-Proofpoint-ORIG-GUID: bCmp8jy28IMcdP3iBZoYBdEpc15N_YHX X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9975 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 impostorscore=0 phishscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2105050165 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L4, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Gcc-patches From: Indu Bhagat Reply-To: Indu Bhagat Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" To support multiple debug formats, we need to move away from explicit enumeration of each individual combination of debug formats. gcc/c-family/ChangeLog: * c-opts.c (c_common_post_options): Adjust access to debug_type_names. * c-pch.c (struct c_pch_validity): Use type uint32_t. (pch_init): Renamed member. (c_common_valid_pch): Adjust access to debug_type_names. gcc/ChangeLog: * common.opt: Change type to support bitmasks. * flag-types.h (enum debug_info_type): Rename enumerator constants. (NO_DEBUG): New bitmask. (DBX_DEBUG): Likewise. (DWARF2_DEBUG): Likewise. (XCOFF_DEBUG): Likewise. (VMS_DEBUG): Likewise. (VMS_AND_DWARF2_DEBUG): Likewise. * flags.h (debug_set_to_format): New function declaration. (debug_set_count): Likewise. (debug_set_names): Likewise. * opts.c (debug_type_masks): Array of bitmasks for debug formats. (debug_set_to_format): New function definition. (debug_set_count): Likewise. (debug_set_names): Likewise. (set_debug_level): Update access to debug_type_names. * toplev.c: Likewise. gcc/objc/ChangeLog: * objc-act.c (synth_module_prologue): Use uint32_t instead of enum debug_info_type. --- gcc/c-family/c-opts.c | 10 +++-- gcc/c-family/c-pch.c | 12 +++--- gcc/common.opt | 2 +- gcc/flag-types.h | 29 ++++++++++---- gcc/flags.h | 17 +++++++- gcc/objc/objc-act.c | 2 +- gcc/opts.c | 109 +++++++++++++++++++++++++++++++++++++++++++++----- gcc/toplev.c | 9 +++-- 8 files changed, 158 insertions(+), 32 deletions(-) diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 89e05a4..e463240 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -1112,9 +1112,13 @@ c_common_post_options (const char **pfilename) /* Only -g0 and -gdwarf* are supported with PCH, for other debug formats we warn here and refuse to load any PCH files. */ if (write_symbols != NO_DEBUG && write_symbols != DWARF2_DEBUG) - warning (OPT_Wdeprecated, - "the %qs debug format cannot be used with " - "pre-compiled headers", debug_type_names[write_symbols]); + { + gcc_assert (debug_set_count (write_symbols) <= 1); + warning (OPT_Wdeprecated, + "the %qs debug format cannot be used with " + "pre-compiled headers", + debug_type_names[debug_set_to_format (write_symbols)]); + } } else if (write_symbols != NO_DEBUG && write_symbols != DWARF2_DEBUG) c_common_no_more_pch (); diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c index fd94c37..6804388 100644 --- a/gcc/c-family/c-pch.c +++ b/gcc/c-family/c-pch.c @@ -52,7 +52,7 @@ enum { struct c_pch_validity { - unsigned char debug_info_type; + uint32_t pch_write_symbols; signed char match[MATCH_SIZE]; void (*pch_init) (void); size_t target_data_length; @@ -108,7 +108,7 @@ pch_init (void) pch_outfile = f; memset (&v, '\0', sizeof (v)); - v.debug_info_type = write_symbols; + v.pch_write_symbols = write_symbols; { size_t i; for (i = 0; i < MATCH_SIZE; i++) @@ -252,13 +252,15 @@ c_common_valid_pch (cpp_reader *pfile, const char *name, int fd) /* The allowable debug info combinations are that either the PCH file was built with the same as is being used now, or the PCH file was built for some kind of debug info but now none is in use. */ - if (v.debug_info_type != write_symbols + if (v.pch_write_symbols != write_symbols && write_symbols != NO_DEBUG) { + gcc_assert (debug_set_count (v.pch_write_symbols) <= 1); + gcc_assert (debug_set_count (write_symbols) <= 1); cpp_warning (pfile, CPP_W_INVALID_PCH, "%s: created with -g%s, but used with -g%s", name, - debug_type_names[v.debug_info_type], - debug_type_names[write_symbols]); + debug_type_names[debug_set_to_format (v.pch_write_symbols)], + debug_type_names[debug_set_to_format (write_symbols)]); return 2; } diff --git a/gcc/common.opt b/gcc/common.opt index a75b44e..ffb968d 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -109,7 +109,7 @@ bool exit_after_options ; flag-types.h for the definitions of the different possible types of ; debugging information. Variable -enum debug_info_type write_symbols = NO_DEBUG +uint32_t write_symbols = NO_DEBUG ; Level of debugging information we are producing. See flag-types.h ; for the definitions of the different possible levels. diff --git a/gcc/flag-types.h b/gcc/flag-types.h index a038c8f..d60bb30 100644 --- a/gcc/flag-types.h +++ b/gcc/flag-types.h @@ -24,15 +24,30 @@ along with GCC; see the file COPYING3. If not see enum debug_info_type { - NO_DEBUG, /* Write no debug info. */ - DBX_DEBUG, /* Write BSD .stabs for DBX (using dbxout.c). */ - DWARF2_DEBUG, /* Write Dwarf v2 debug info (using dwarf2out.c). */ - XCOFF_DEBUG, /* Write IBM/Xcoff debug info (using dbxout.c). */ - VMS_DEBUG, /* Write VMS debug info (using vmsdbgout.c). */ - VMS_AND_DWARF2_DEBUG /* Write VMS debug info (using vmsdbgout.c). - and DWARF v2 debug info (using dwarf2out.c). */ + DINFO_TYPE_NONE = 0, /* No debug info. */ + DINFO_TYPE_DBX = 1, /* BSD .stabs for DBX. */ + DINFO_TYPE_DWARF2 = 2, /* Dwarf v2 debug info. */ + DINFO_TYPE_XCOFF = 3, /* IBM/Xcoff debug info. */ + DINFO_TYPE_VMS = 4, /* VMS debug info. */ + DINFO_TYPE_MAX = DINFO_TYPE_VMS /* Marker only. */ }; +#define NO_DEBUG (0U) +/* Write DBX debug info (using dbxout.c). */ +#define DBX_DEBUG (1U << DINFO_TYPE_DBX) +/* Write DWARF2 debug info (using dwarf2out.c). */ +#define DWARF2_DEBUG (1U << DINFO_TYPE_DWARF2) +/* Write IBM/XCOFF debug info (using dbxout.c). */ +#define XCOFF_DEBUG (1U << DINFO_TYPE_XCOFF) +/* Write VMS debug info (using vmsdbgout.c). */ +#define VMS_DEBUG (1U << DINFO_TYPE_VMS) +/* Note: Adding new definitions to handle -combination- of debug formats, + like VMS_AND_DWARF2_DEBUG is not recommended. This definition remains + here for historical reasons. */ +/* Write VMS debug info (using vmsdbgout.c) and DWARF v2 debug info (using + dwarf2out.c). */ +#define VMS_AND_DWARF2_DEBUG ((VMS_DEBUG | DWARF2_DEBUG)) + enum debug_info_levels { DINFO_LEVEL_NONE, /* Write no debugging info. */ diff --git a/gcc/flags.h b/gcc/flags.h index 0c4409e..3415493 100644 --- a/gcc/flags.h +++ b/gcc/flags.h @@ -22,9 +22,24 @@ along with GCC; see the file COPYING3. If not see #if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS) && !defined(IN_RTS) -/* Names of debug_info_type, for error messages. */ +/* Names of fundamental debug info formats indexed by enum + debug_info_type. */ + extern const char *const debug_type_names[]; +/* Get enum debug_info_type of the specified debug format, for error messages. + Can be used only for individual debug format types. */ + +extern enum debug_info_type debug_set_to_format (uint32_t debug_info_set); + +/* Get the number of debug formats enabled for output. */ + +unsigned int debug_set_count (uint32_t w_symbols); + +/* Get the names of the debug formats enabled for output. */ + +const char * debug_set_names (uint32_t w_symbols); + extern void strip_off_ending (char *, int); extern int base_of_path (const char *path, const char **base_out); diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 1cbd586..a5aa3c5 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -3078,7 +3078,7 @@ static void synth_module_prologue (void) { tree type; - enum debug_info_type save_write_symbols = write_symbols; + uint32_t save_write_symbols = write_symbols; const struct gcc_debug_hooks *const save_hooks = debug_hooks; /* Suppress outputting debug symbols, because diff --git a/gcc/opts.c b/gcc/opts.c index 24bb641..026952f 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -37,12 +37,95 @@ along with GCC; see the file COPYING3. If not see static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff); -/* Indexed by enum debug_info_type. */ +/* Names of fundamental debug info formats indexed by enum + debug_info_type. */ + const char *const debug_type_names[] = { "none", "stabs", "dwarf-2", "xcoff", "vms" }; +/* Bitmasks of fundamental debug info formats indexed by enum + debug_info_type. */ + +static uint32_t debug_type_masks[] = +{ + NO_DEBUG, DBX_DEBUG, DWARF2_DEBUG, XCOFF_DEBUG, VMS_DEBUG +}; + +/* Names of the set of debug formats requested by user. Updated and accessed + via debug_set_names. */ + +static char df_set_names[sizeof "none stabs dwarf-2 xcoff vms"]; + +/* Get enum debug_info_type of the specified debug format, for error messages. + Can be used only for individual debug format types. */ + +enum debug_info_type +debug_set_to_format (uint32_t debug_info_set) +{ + int idx = 0; + enum debug_info_type dinfo_type = DINFO_TYPE_NONE; + /* Find first set bit. */ + if (debug_info_set) + idx = exact_log2 (debug_info_set & - debug_info_set); + /* Check that only one bit is set, if at all. This function is meant to be + used only for vanilla debug_info_set bitmask values, i.e. for individual + debug format types upto DINFO_TYPE_MAX. */ + gcc_assert ((debug_info_set & (debug_info_set - 1)) == 0); + dinfo_type = (enum debug_info_type)idx; + gcc_assert (dinfo_type <= DINFO_TYPE_MAX); + return dinfo_type; +} + +/* Get the number of debug formats enabled for output. */ + +unsigned int +debug_set_count (uint32_t w_symbols) +{ + unsigned int count = 0; + while (w_symbols) + { + ++ count; + w_symbols &= ~ (w_symbols & - w_symbols); + } + return count; +} + +/* Get the names of the debug formats enabled for output. */ + +const char * +debug_set_names (uint32_t w_symbols) +{ + uint32_t df_mask = 0; + /* Reset the string to be returned. */ + memset (df_set_names, 0, sizeof (df_set_names)); + /* Get the popcount. */ + int num_set_df = debug_set_count (w_symbols); + /* Iterate over the debug formats. Add name string for those enabled. */ + for (int i = DINFO_TYPE_NONE; i <= DINFO_TYPE_MAX; i++) + { + df_mask = debug_type_masks[i]; + if (w_symbols & df_mask) + { + strcat (df_set_names, debug_type_names[i]); + num_set_df--; + if (num_set_df) + strcat (df_set_names, " "); + else + break; + } + else if (!w_symbols) + { + /* No debug formats enabled. */ + gcc_assert (i == DINFO_TYPE_NONE); + strcat (df_set_names, debug_type_names[i]); + break; + } + } + return df_set_names; +} + /* Parse the -femit-struct-debug-detailed option value and set the flag variables. */ @@ -190,7 +273,7 @@ static const char use_diagnosed_msg[] = N_("Uses of this option are diagnosed.") typedef char *char_p; /* For DEF_VEC_P. */ -static void set_debug_level (enum debug_info_type type, int extended, +static void set_debug_level (uint32_t dinfo, int extended, const char *arg, struct gcc_options *opts, struct gcc_options *opts_set, location_t loc); @@ -3027,17 +3110,17 @@ fast_math_flags_struct_set_p (struct cl_optimization *opt) } /* Handle a debug output -g switch for options OPTS - (OPTS_SET->x_write_symbols storing whether a debug type was passed + (OPTS_SET->x_write_symbols storing whether a debug format was passed explicitly), location LOC. EXTENDED is true or false to support extended output (2 is special and means "-ggdb" was given). */ static void -set_debug_level (enum debug_info_type type, int extended, const char *arg, +set_debug_level (uint32_t dinfo, int extended, const char *arg, struct gcc_options *opts, struct gcc_options *opts_set, location_t loc) { opts->x_use_gnu_debug_info_extensions = extended; - if (type == NO_DEBUG) + if (dinfo == NO_DEBUG) { if (opts->x_write_symbols == NO_DEBUG) { @@ -3058,14 +3141,18 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg, } else { - /* Does it conflict with an already selected type? */ + /* Does it conflict with an already selected debug format? */ if (opts_set->x_write_symbols != NO_DEBUG && opts->x_write_symbols != NO_DEBUG - && type != opts->x_write_symbols) - error_at (loc, "debug format %qs conflicts with prior selection", - debug_type_names[type]); - opts->x_write_symbols = type; - opts_set->x_write_symbols = type; + && dinfo != opts->x_write_symbols) + { + gcc_assert (debug_set_count (dinfo) <= 1); + error_at (loc, "debug format %qs conflicts with prior selection", + debug_type_names[debug_set_to_format (dinfo)]); + } + + opts->x_write_symbols = dinfo; + opts_set->x_write_symbols = dinfo; } /* A debug flag without a level defaults to level 2. diff --git a/gcc/toplev.c b/gcc/toplev.c index d8cc254..a0ccec4 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1460,9 +1460,12 @@ process_options (void) debug_hooks = &dwarf2_lineno_debug_hooks; #endif else - error_at (UNKNOWN_LOCATION, - "target system does not support the %qs debug format", - debug_type_names[write_symbols]); + { + gcc_assert (debug_set_count (write_symbols) <= 1); + error_at (UNKNOWN_LOCATION, + "target system does not support the %qs debug format", + debug_type_names[debug_set_to_format (write_symbols)]); + } /* We know which debug output will be used so we can set flag_var_tracking and flag_var_tracking_uninit if the user has not specified them. */