From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 152993858016 for ; Wed, 28 Sep 2022 18:45:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 152993858016 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28SGww00005292 for ; Wed, 28 Sep 2022 18:45:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=message-id : date : subject : to : references : cc : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=lvLvOG9+rRveLtnasmyop9+5+/nArPSbsjInOE5BGtQ=; b=S755jT/kICLOsvpi4VqN6YW+A5iPENaYKiW3tVGIUOEu4Qo4s3qn2KvVcepZeE1OOSWI 0X0d7QotwCH+dYOEjy7VpZmORKW0txtmCzHV8wpyUHaVxdDkmpgdG8cpyd7rmcdcKRe9 8+dD/RbgGPot2tkb+meaZ24IbhyZk9EO6cAsCgcL7Gf8d9BOlVRW0cyVEVwBqk9Qykmd GOv/uc8S/vpvjDlsYi2a3g8MYT6ffArltiIKPsvZu4ZWh6TF6AFRIP04YdAu0dIgbHxn To99VW2I984cf0lO5Q1mX8elfsHnQb84m+EFv9CCyKnZsvbt6MWDg6+6yK0tWbvLOXQ3 5Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3jssrwjtey-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Sep 2022 18:45:28 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 28SGH07K040250 for ; Wed, 28 Sep 2022 18:45:28 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2177.outbound.protection.outlook.com [104.47.73.177]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3jtpub2pyv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Sep 2022 18:45:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tucal84xIbti938B0d9chjq/Y3wJaYL+AqQWd3tuh3gyutBBZcYFEsVTeHkaBLSWxViwBvWZD+4F9Iydw26/o8gPeX2D1byQ0H5nDnDh4FrPZtKjegneL0aqvNaz/9gEhRd6SCE+vMGz7EoJITXSUNs6j+7J1ueuvm7oHnxvhkX0yU7+J1xT+duwQIM0S79zgMOT2jLUoNTCaDaJsPNULShwiwLMR/a0WIPYYtnSSMJ92vhEUl4HozlAfD1d1U83I6U5zPzhNarGmfMY4XBSDP4BgA93YWejB6krTXsOUTSDbg7jVAvRtlIGWaA2ptbXqvlzGrkSSfGXTvBAC0seRQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lvLvOG9+rRveLtnasmyop9+5+/nArPSbsjInOE5BGtQ=; b=YsY10+g++kOFTIEpkPDPfVzR4joIsWXT8TxiuSSZvs+DnsINebhs7UccV6As1VC4kiCIDlG12eNOP9kwCYMAs5VrUQ86iffcpOU31SARYhFaRv7ijzS8I9pp33efiUP/nxcVkcU76bC/0uX70cYRzkJ5Wj1W9DNmrL8pMsQ9SZ3mIyP4kwvXHig92F2H8c1o4dxf+wMaRIZjLgmxUAJ3wqyYxorHXzlISKIOii5d3anHp3WVP2SD6o4EPwEc3QTQSbPm5UFmBXgN3eS7o3c9OkQI119oTE8pI2NmF0rWh/TGwVDsmhaj6lWdPwJIFw7i07iGPHRImRaVtovt/zk7Sw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lvLvOG9+rRveLtnasmyop9+5+/nArPSbsjInOE5BGtQ=; b=BXXOi5ySMj93v7g46HbBsfVeZ8nDBtS3qb82jQb6YXycuZs0WDEp/sQYkEMyvCPJ6lbmuQKUtmEHR+wjj027lHjqIywza+MTlIslCs787FtdPTa/m6mjrxU3eJCqSGnSy4w9t6HF5aO6En+x1cS8vRngrsHO9d6rQwQjxGDcYkw= Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by DS7PR10MB5008.namprd10.prod.outlook.com (2603:10b6:5:3b1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 18:45:25 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d70f:89ff:35d9:731d]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d70f:89ff:35d9:731d%6]) with mapi id 15.20.5654.026; Wed, 28 Sep 2022 18:45:25 +0000 Message-ID: <2debbcea-96b5-f89c-191b-5787bbb2b048@oracle.com> Date: Wed, 28 Sep 2022 11:45:22 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH] btf: Add support to BTF_KIND_ENUM64 type Content-Language: en-US To: "Guillermo E. Martinez" References: <20220829211106.427267-1-guillermo.e.martinez@oracle.com> Cc: gcc-patches@gcc.gnu.org, Indu Bhagat From: David Faust In-Reply-To: <20220829211106.427267-1-guillermo.e.martinez@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BY5PR20CA0016.namprd20.prod.outlook.com (2603:10b6:a03:1f4::29) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|DS7PR10MB5008:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e41ba84-59fa-4294-204e-08daa1819af1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9qdgfiFnMFBm/OaCKol5q2zWiWyntoyS+bRDm3SaAmk9ozqwzI4KmuJF2pzsWxf2uk3hhe2Bw4YJaX78ev78LlwFRmQNkKhBwWGwooGNpwlBLg6dlaGy1NFpYmSCOpZdpOgUGFUO15Wa8odw0pvZNCCsNUnnbepLYGDBc2lmp0HBp5KNzJ+19m0IXfatiJspCfgQbUGJuDxlVFalNkbORMFpZ+03cUwAfBL72QmTkyBjCM4Skfj0XIkga3mE0VioXwMB52MOeNlRAMeJmUgp5OdA1yWuclcseqjkbzridHdX5+qVGcityVUoFAE/2mM73pA0/9VAzx7jS1p4uPI/9yujsxB5S7Yz3xrfvDIjzs4gw1oMK3dFA3ziseW/MJrOu/pEpvzC7T/LrlDYoYtRYmSlID2s+QooTM6ZUE1DC9/t/tDA22eI6q0epDzmeVKHhO6TP0HcB4AqlpZA9G8FTwnUAaCN5nOLL+SlPGANBeigLFeFsbcPuGIzcVay+cPPafQkeL+9WPJGAzC/Vkxehh0ONaIZcY6IckH3WL7XlHvvQZ3AhINYpS4czLaSo52gNfu3MGgm5qj+F0OEtGFIcSo9KGIDAfZGJqXeAb4Z5zta3X+RfxC2/pcKYT9rK0A3WjVM/gDYvTRXwEa8xcLIf1GqKJzELNTvd+xqxmudY4215ro2bGmxxbDNFNVdtXHnjfwe8t3fglxyIBupupEti/epTq8+8xZ6Gmf8gIab2rp3itQlHlcjn2uVztG64IkSRBle7mIyKnk1TnjrG/kcCE6+Enyrix3eW0+aKXSFy4Jr7LkS9FdGztelrlgLT/kbUm3yWELHT61dSYMAJtllqsNpGm3VQ8cP8ChbQoplEhM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB3213.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(396003)(366004)(346002)(136003)(39860400002)(451199015)(84970400001)(5660300002)(8936002)(4326008)(66556008)(6862004)(41300700001)(66946007)(8676002)(478600001)(6486002)(66476007)(37006003)(316002)(6636002)(186003)(83380400001)(6506007)(44832011)(107886003)(53546011)(30864003)(6666004)(36756003)(2906002)(26005)(6512007)(2616005)(86362001)(31696002)(38100700002)(31686004)(66899015)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVlhZERRT3I0KzRkQU1RTlFJZURBNU83K05CTjRCWnY2RGlRdTdGbVV3MkQw?= =?utf-8?B?QmpxNEtsN1pRNC9peEhNdnVxakdsMFUvQlk2elB3bUticGRYT3ltNkUxYWhM?= =?utf-8?B?aW9RZHUvanVEd1RHTUdiVS92NVcyTEpGSlAyY3g0ZWNkK0IyS1g4UEkrNjFP?= =?utf-8?B?c0ZSZHpaOGRZQmpVTk4zcDBaeTFRWmVhamNIcDkrckI5YU1pbVJTa1hSaGhv?= =?utf-8?B?Mm1ic1g0d0N6VDVwa3F1YkJFNkh1R1Y4bVlnKzlsaGpJY0F0ZnZKL25iN1FG?= =?utf-8?B?eCtsOWRTTW00T1VpNFBOd0V4Zm1Qd1dzdVAvVU52N3R3REs1L2d6MEJOV0ZT?= =?utf-8?B?WDJnMEdWMkE3eXpEK2NDYmNxR0ZSOEhMYUYwRDVRTFIzcGFjTzhBU0l0ZGw0?= =?utf-8?B?a29raWJHMThmcThzNElaZ0tiMmFxSm1IVGhZVnJ3aVVLTFE0MHNIeGl5clZ0?= =?utf-8?B?aG8zVlhWelRnMjZ1OGRGbGgzWjI4QUF4RTVVYlgreUNSMWxyNnVFZ0hNUVVq?= =?utf-8?B?L3RsWXJNYnQxZ2lkRjFJRUFNVTRBK2F2YlJQdTBrQVBBT0xjdTRVR2tkVkhv?= =?utf-8?B?QUhIalRRWFZ4RGpkU2xkRVNZWlluWnAxTXFQNkt4cDlNVTRSWHYwRkd6NWxK?= =?utf-8?B?UXYwd1orTGVac3kxUzA1b0FNSDNlOURqdjIvWHM4T0hyWWlCRkR2eExGN0JX?= =?utf-8?B?UXpyOXZZQ2llN2t2aStoSlFkbDNveHp2eUxPLytuZytXZFEvWWcwamRiWXU5?= =?utf-8?B?TGpscEVWMDRxb3p4eXVwbHZsOXh4RFgreFluVjdVbkFZQ0Q0aXpJK2Nvb215?= =?utf-8?B?c1c2NzRVbE1PaGJuR0hTOUFmMW55ODVCeElrdmZHWUczYVcyK2lCQmJMMTFI?= =?utf-8?B?NEJvcVcvVmVRSldHVVZMcXhRNXBURDMrd0Z3RFJlQ2hBbks5cUZCU3FNd0R3?= =?utf-8?B?WUFLY04zLzdVTGNOMnd1bnA2eEZ5ZVVZSksyaERSd3p1VXJIbHRRL0F3b1RW?= =?utf-8?B?QnBkeHA4VkNDTllmREI5WTZzWTRzM3d2VzZ5aW1oQkZjTnBwZkFTbU13ei9r?= =?utf-8?B?UjkxaHUzYjVIVTBzZ2dQdDZlYnN6REZCbmordkRMUG9KTmk2OVpRZGhKZU5C?= =?utf-8?B?L21yTnNlM0dEcUE5WGtKb2pZQm1iQUNDRG5pRFFVZnFmREF3U3lIb2x2a2RT?= =?utf-8?B?RlhucGNPdHY1S3RYeGZjY2RvS25zWUlkMFR2ckVEbFhIR28rRnpIWmFZUklJ?= =?utf-8?B?dFh2STFtZnhwV28wVVpzTFgrWGtIdTFQMWp5eWpsenZiRWFaUlhWRkZtS0Zv?= =?utf-8?B?N2pNNVlpVXRSSGtTb0dTamZtNUFyRUw3TG5qQk9pbSs5SDVIRDhBVnlIRTlR?= =?utf-8?B?Q3E0RU1zTWhVS3ZWWklnUWYzMjNRVEx2ZDJvbjlPZkkvUFVjRDRQSTZ1UlR0?= =?utf-8?B?cjBHWjdvVzdPVkkrZFR0Zlp5M2pIS1ByMHJkdlBydURqWE91Z2xkUXhrSDIw?= =?utf-8?B?ZDhBSkVFeDJRQk5pbm90OTNRdmJCcUNXZnVvZmZweWVRU0dSRG05WkhDQi9N?= =?utf-8?B?Zy9jbklzZXUrNEFiTFljNWlmajFLeDNWOVhyU3BCRThZMG5XOTJvOXVXWjlx?= =?utf-8?B?MDd3d2NUTnk4N1YrQ1VMb0l1YkYvejJkdWl6Tk9XZnVwWm04K0w2M3BkdHdR?= =?utf-8?B?WUVFS3U0ZmZYRWl2blh6VXNBdEt6enNTQWQ3QzNXVTEwY25QOWcxcjNRTmdM?= =?utf-8?B?VkF2YkNQZ0V1di9Ca0FBUTdFdCtTL2pzVFRxN1NRMXVsZjFIS2JRb2M2bEVj?= =?utf-8?B?alRDMHcyRzN1aFpqbWsrUkdkZ0x2WkhIT1NJNmNDNytBV3lqWXlFNGlNS1ky?= =?utf-8?B?TTlHVHd6ZjF0ZUVpSitMTTZVNzdQdmRqeWhqSjdYKytHcllxK1RmWDlJa1B5?= =?utf-8?B?VWNKSnQxRVJUQld3VEwzWnNhK2Y1WVFlaVlBSTViS1o1OVdQa09Qc1RPQVA0?= =?utf-8?B?NjVmZ0xHWEFSd0JLK0RqVnFLWlBxM21XbVgzMDVWZUdJUElYOC94amxxWlRw?= =?utf-8?B?UHB1OWpndmZFbW1WbXNPR0swcC8wck90dDB0dUdOcWVGbWphL3VNOTlveVFu?= =?utf-8?Q?zNxCyih1qgIa6SHzaKQKZZ0ik?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e41ba84-59fa-4294-204e-08daa1819af1 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 18:45:25.1974 (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: hf2A5EwtoXuxiPUMaQDKKwBNpve7rKOnhhgSIzXX+HGMjgE1Ugf/A1z7x6oBf7TOTG/TBTxnpdnKuk5ewjKVQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5008 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-28_08,2022-09-28_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 suspectscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2209280111 X-Proofpoint-ORIG-GUID: sadaY4OqRCmzEpzwubUK5J0Qu7x1HIyA X-Proofpoint-GUID: sadaY4OqRCmzEpzwubUK5J0Qu7x1HIyA X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Guillermo, Thanks for the patch. Just a couple of small nits on the changelog entries below but otherwise very nice, LGTM. But, please wait a couple of days before pushing to give Indu time to raise any objections about the changes in ctfc/dwarf2ctf. Thanks! David On 8/29/22 14:11, Guillermo E. Martinez via Gcc-patches wrote: > Hello GCC team, > > The following patch update BTF/CTF backend to support > BTF_KIND_ENUM64 type. > > Comments will be welcomed and appreciated!, > > Kind regards, > guillermo > -- > > BTF supports 64-bits enumerators with following encoding: > > struct btf_type: > name_off: 0 or offset to a valid C identifier > info.kind_flag: 0 for unsigned, 1 for signed > info.kind: BTF_KIND_ENUM64 > info.vlen: number of enum values > size: 1/2/4/8 > > The btf_type is followed by info.vlen number of: > > struct btf_enum64 > { > uint32_t name_off; /* Offset in string section of enumerator name. */ > uint32_t val_lo32; /* lower 32-bit value for a 64-bit value Enumerator */ > uint32_t val_hi32; /* high 32-bit value for a 64-bit value Enumerator */ > }; > > So, a new btf_enum64 structure was added to represent BTF_KIND_ENUM64 > and a new field in ctf_dtdef to represent specific type's properties, in > the particular case for CTF enums it helps to distinguish when its > enumerators values are signed or unsigned, later that information is > used to encode the BTF enum type. > > gcc/ChangeLog: > > * btfout.cc (btf_calc_num_vbytes): Compute enumeration size depending of > enumerator type btf_enum{,64}. > (btf_asm_type): Update btf_kflag according to enumerators sign, > using correct BPF type in BTF_KIND_ENUMi{,64}. > (btf_asm_enum_const): New argument to represent the size of > the BTF enum type. > * ctfc.cc (ctf_add_enum): Use and initialization of flag field to > CTF_ENUM_F_NONE. > (ctf_add_enumerator): New argument to represent CTF flags, > updating the comment and flag vaue according to enumerators > sing. > * ctfc.h (ctf_dmdef): Update dmd_value to HOST_WIDE_INT to allow > use 32/64 bits enumerators. > (ctf_dtdef): Add flags to to describe specifyc type's properties. typo: specific > * dwarf2ctf.cc (gen_ctf_enumeration_type): Update flags field > depending when a signed enumerator value is found. > include/btf.h (btf_enum64): Add new definition and new symbolic > constant to BTF_KIND_ENUM64 and BTF_KF_ENUM_{UN,}SIGNED. Missing an * here for include/btf.h > > gcc/testsuite/ChangeLog: > > gcc.dg/debug/btf/btf-enum-1.c: Update testcase, with correct > info.kflags encoding. > gcc.dg/debug/btf/btf-enum64-1.c: New testcase. Likewise for these ChangeLog entries. You can use contrib/gcc-changelog/git_check_commit.py to check the formatting of the entries. > --- > gcc/btfout.cc | 24 ++++++++--- > gcc/ctfc.cc | 14 ++++--- > gcc/ctfc.h | 9 +++- > gcc/dwarf2ctf.cc | 9 +++- > gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c | 2 +- > gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c | 41 +++++++++++++++++++ > include/btf.h | 19 +++++++-- > 7 files changed, 99 insertions(+), 19 deletions(-) > create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c > > diff --git a/gcc/btfout.cc b/gcc/btfout.cc > index 997a33fa089..4b11c867c23 100644 > --- a/gcc/btfout.cc > +++ b/gcc/btfout.cc > @@ -223,7 +223,9 @@ btf_calc_num_vbytes (ctf_dtdef_ref dtd) > break; > > case BTF_KIND_ENUM: > - vlen_bytes += vlen * sizeof (struct btf_enum); > + vlen_bytes += (dtd->dtd_data.ctti_size == 0x8) > + ? vlen * sizeof (struct btf_enum64) > + : vlen * sizeof (struct btf_enum); > break; > > case BTF_KIND_FUNC_PROTO: > @@ -622,6 +624,15 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) > btf_size_type = 0; > } > > + if (btf_kind == BTF_KIND_ENUM) > + { > + btf_kflag = (dtd->flags & CTF_ENUM_F_ENUMERATORS_SIGNED) > + ? BTF_KF_ENUM_SIGNED > + : BTF_KF_ENUM_UNSIGNED; > + if (dtd->dtd_data.ctti_size == 0x8) > + btf_kind = BTF_KIND_ENUM64; > + } > + > dw2_asm_output_data (4, dtd->dtd_data.ctti_name, "btt_name"); > dw2_asm_output_data (4, BTF_TYPE_INFO (btf_kind, btf_kflag, btf_vlen), > "btt_info: kind=%u, kflag=%u, vlen=%u", > @@ -634,6 +645,7 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) > case BTF_KIND_UNION: > case BTF_KIND_ENUM: > case BTF_KIND_DATASEC: > + case BTF_KIND_ENUM64: > dw2_asm_output_data (4, dtd->dtd_data.ctti_size, "btt_size: %uB", > dtd->dtd_data.ctti_size); > return; > @@ -707,13 +719,13 @@ btf_asm_sou_member (ctf_container_ref ctfc, ctf_dmdef_t * dmd) > } > } > > -/* Asm'out an enum constant following a BTF_KIND_ENUM. */ > +/* Asm'out an enum constant following a BTF_KIND_ENUM{,64}. */ > > static void > -btf_asm_enum_const (ctf_dmdef_t * dmd) > +btf_asm_enum_const (unsigned int size, ctf_dmdef_t * dmd) > { > dw2_asm_output_data (4, dmd->dmd_name_offset, "bte_name"); > - dw2_asm_output_data (4, dmd->dmd_value, "bte_value"); > + dw2_asm_output_data (size, dmd->dmd_value, "bte_value"); > } > > /* Asm'out a function parameter description following a BTF_KIND_FUNC_PROTO. */ > @@ -871,7 +883,7 @@ output_asm_btf_sou_fields (ctf_container_ref ctfc, ctf_dtdef_ref dtd) > btf_asm_sou_member (ctfc, dmd); > } > > -/* Output all enumerator constants following a BTF_KIND_ENUM. */ > +/* Output all enumerator constants following a BTF_KIND_ENUM{,64}. */ > > static void > output_asm_btf_enum_list (ctf_container_ref ARG_UNUSED (ctfc), > @@ -881,7 +893,7 @@ output_asm_btf_enum_list (ctf_container_ref ARG_UNUSED (ctfc), > > for (dmd = dtd->dtd_u.dtu_members; > dmd != NULL; dmd = (ctf_dmdef_t *) ctf_dmd_list_next (dmd)) > - btf_asm_enum_const (dmd); > + btf_asm_enum_const (dtd->dtd_data.ctti_size, dmd); > } > > /* Output all function arguments following a BTF_KIND_FUNC_PROTO. */ > diff --git a/gcc/ctfc.cc b/gcc/ctfc.cc > index 9773358a475..253c36b6a0a 100644 > --- a/gcc/ctfc.cc > +++ b/gcc/ctfc.cc > @@ -604,6 +604,7 @@ ctf_add_enum (ctf_container_ref ctfc, uint32_t flag, const char * name, > gcc_assert (size <= CTF_MAX_SIZE); > > dtd->dtd_data.ctti_size = size; > + dtd->flags = CTF_ENUM_F_NONE; > > ctfc->ctfc_num_stypes++; > > @@ -612,7 +613,7 @@ ctf_add_enum (ctf_container_ref ctfc, uint32_t flag, const char * name, > > int > ctf_add_enumerator (ctf_container_ref ctfc, ctf_id_t enid, const char * name, > - HOST_WIDE_INT value, dw_die_ref die) > + HOST_WIDE_INT value, uint32_t flags, dw_die_ref die) > { > ctf_dmdef_t * dmd; > uint32_t kind, vlen, root; > @@ -630,10 +631,12 @@ ctf_add_enumerator (ctf_container_ref ctfc, ctf_id_t enid, const char * name, > > gcc_assert (kind == CTF_K_ENUM && vlen < CTF_MAX_VLEN); > > - /* Enum value is of type HOST_WIDE_INT in the compiler, dmd_value is int32_t > - on the other hand. Check bounds and skip adding this enum value if out of > - bounds. */ > - if ((value > INT_MAX) || (value < INT_MIN)) > + /* Enum value is of type HOST_WIDE_INT in the compiler, CTF enumerators > + values in ctf_enum_t is limited to int32_t, BTF supports signed and > + unsigned enumerators values of 32 and 64 bits, for both debug formats > + we use ctf_dmdef_t.dmd_value entry of HOST_WIDE_INT type. So check > + CTF bounds and skip adding this enum value if out of bounds. */ > + if (!btf_debuginfo_p() && ((value > INT_MAX) || (value < INT_MIN))) > { > /* FIXME - Note this TBD_CTF_REPRESENTATION_LIMIT. */ > return (1); > @@ -649,6 +652,7 @@ ctf_add_enumerator (ctf_container_ref ctfc, ctf_id_t enid, const char * name, > dmd->dmd_value = value; > > dtd->dtd_data.ctti_info = CTF_TYPE_INFO (kind, root, vlen + 1); > + dtd->flags |= flags; > ctf_dmd_list_append (&dtd->dtd_u.dtu_members, dmd); > > if ((name != NULL) && strcmp (name, "")) > diff --git a/gcc/ctfc.h b/gcc/ctfc.h > index bcf3a43ae1b..a22342b2610 100644 > --- a/gcc/ctfc.h > +++ b/gcc/ctfc.h > @@ -125,6 +125,10 @@ typedef struct GTY (()) ctf_itype > > #define CTF_FUNC_VARARG 0x1 > > +/* Enum specific flags. */ > +#define CTF_ENUM_F_NONE (0) > +#define CTF_ENUM_F_ENUMERATORS_SIGNED (1 << 0) > + > /* Struct/union/enum member definition for CTF generation. */ > > typedef struct GTY ((chain_next ("%h.dmd_next"))) ctf_dmdef > @@ -133,7 +137,7 @@ typedef struct GTY ((chain_next ("%h.dmd_next"))) ctf_dmdef > ctf_id_t dmd_type; /* Type of this member (for sou). */ > uint32_t dmd_name_offset; /* Offset of the name in str table. */ > uint64_t dmd_offset; /* Offset of this member in bits (for sou). */ > - int dmd_value; /* Value of this member (for enum). */ > + HOST_WIDE_INT dmd_value; /* Value of this member (for enum). */ > struct ctf_dmdef * dmd_next; /* A list node. */ > } ctf_dmdef_t; > > @@ -162,6 +166,7 @@ struct GTY ((for_user)) ctf_dtdef > bool from_global_func; /* Whether this type was added from a global > function. */ > uint32_t linkage; /* Used in function types. 0=local, 1=global. */ > + uint32_t flags; /* Flags to describe specific type's properties. */ > union GTY ((desc ("ctf_dtu_d_union_selector (&%1)"))) > { > /* struct, union, or enum. */ > @@ -429,7 +434,7 @@ extern ctf_id_t ctf_add_sou (ctf_container_ref, uint32_t, const char *, > uint32_t, size_t, dw_die_ref); > > extern int ctf_add_enumerator (ctf_container_ref, ctf_id_t, const char *, > - HOST_WIDE_INT, dw_die_ref); > + HOST_WIDE_INT, uint32_t, dw_die_ref); > extern int ctf_add_member_offset (ctf_container_ref, dw_die_ref, const char *, > ctf_id_t, uint64_t); > extern int ctf_add_function_arg (ctf_container_ref, dw_die_ref, > diff --git a/gcc/dwarf2ctf.cc b/gcc/dwarf2ctf.cc > index 397100004c2..0ef96dd48fd 100644 > --- a/gcc/dwarf2ctf.cc > +++ b/gcc/dwarf2ctf.cc > @@ -772,6 +772,7 @@ gen_ctf_enumeration_type (ctf_container_ref ctfc, dw_die_ref enumeration) > const char *enumerator_name; > dw_attr_node *enumerator_value; > HOST_WIDE_INT value_wide_int; > + uint32_t flags = 0; > > c = dw_get_die_sib (c); > > @@ -785,10 +786,14 @@ gen_ctf_enumeration_type (ctf_container_ref ctfc, dw_die_ref enumeration) > == dw_val_class_unsigned_const_implicit)) > value_wide_int = AT_unsigned (enumerator_value); > else > - value_wide_int = AT_int (enumerator_value); > + { > + value_wide_int = AT_int (enumerator_value); > + flags |= CTF_ENUM_F_ENUMERATORS_SIGNED; > + } > > ctf_add_enumerator (ctfc, enumeration_type_id, > - enumerator_name, value_wide_int, enumeration); > + enumerator_name, value_wide_int, > + flags, enumeration); > } > while (c != dw_get_die_child (enumeration)); > } > diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c > index 728493b0804..7e940529f1b 100644 > --- a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c > +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c > @@ -4,7 +4,7 @@ > /* { dg-options "-O0 -gbtf -dA" } */ > > /* { dg-final { scan-assembler-times "\[\t \]0x6000004\[\t \]+\[^\n\]*btt_info" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]0x6000003\[\t \]+\[^\n\]*btt_info" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]0x86000003\[\t \]+\[^\n\]*btt_info" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"QAD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"QED.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"QOD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c > new file mode 100644 > index 00000000000..da103842807 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c > @@ -0,0 +1,41 @@ > +/* Test BTF generation for 64 bits enums. */ > + > +/* { dg-do compile } */ > +/* { dg-options "-O0 -gbtf -dA" } */ > + > +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum1,\[\t \]8" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum2,\[\t \]8" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum3,\[\t \]8" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]0x13000003\[\t \]+\[^\n\]*btt_info" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]0x93000003\[\t \]+\[^\n\]*btt_info" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"B1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"B2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"B3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"C1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"C2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"C3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"D1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"D2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "ascii \"D3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ > +/* { dg-final { scan-assembler-times "bte_value" 9 } } */ > + > +enum default_enum > +{ > + B1 = 0xffffffffaa, > + B2 = 0xbbbbbbbb, > + B3 = 0xaabbccdd, > +} myenum1 = B1; > + > +enum explicit_unsigned > +{ > + C1 = 0xffffffffbbUL, > + C2 = 0xbbbbbbbb, > + C3 = 0xaabbccdd, > +} myenum2 = C1; > + > +enum signed64 > +{ > + D1 = 0xffffffffaa, > + D2 = 0xbbbbbbbb, > + D3 = -0x1, > +} myenum3 = D1; > diff --git a/include/btf.h b/include/btf.h > index 78b551ced23..eba67f9d599 100644 > --- a/include/btf.h > +++ b/include/btf.h > @@ -109,7 +109,8 @@ struct btf_type > #define BTF_KIND_VAR 14 /* Variable. */ > #define BTF_KIND_DATASEC 15 /* Section such as .bss or .data. */ > #define BTF_KIND_FLOAT 16 /* Floating point. */ > -#define BTF_KIND_MAX BTF_KIND_FLOAT > +#define BTF_KIND_ENUM64 19 /* Enumeration up to 64 bits. */ > +#define BTF_KIND_MAX BTF_KIND_ENUM64 > #define NR_BTF_KINDS (BTF_KIND_MAX + 1) > > /* For some BTF_KINDs, struct btf_type is immediately followed by > @@ -130,14 +131,17 @@ struct btf_type > #define BTF_INT_BOOL (1 << 2) > > /* BTF_KIND_ENUM is followed by VLEN struct btf_enum entries, > - which describe the enumerators. Note that BTF currently only > - supports signed 32-bit enumerator values. */ > + which describe the enumerators. */ > struct btf_enum > { > uint32_t name_off; /* Offset in string section of enumerator name. */ > int32_t val; /* Enumerator value. */ > }; > > +/* BTF_KF_ENUM_ holds the flags for kflags in BTF_KIND_ENUM{,64}. */ > +#define BTF_KF_ENUM_UNSIGNED (0) > +#define BTF_KF_ENUM_SIGNED (1 << 0) > + > /* BTF_KIND_ARRAY is followed by a single struct btf_array. */ > struct btf_array > { > @@ -190,6 +194,15 @@ struct btf_var_secinfo > uint32_t size; /* Size (in bytes) of variable. */ > }; > > +/* BTF_KIND_ENUM64 is followed by VLEN struct btf_enum64 entries, > + which describe the 64 bits enumerators. */ > +struct btf_enum64 > +{ > + uint32_t name_off; /* Offset in string section of enumerator name. */ > + uint32_t val_lo32; /* lower 32-bit value for a 64-bit value Enumerator */ > + uint32_t val_hi32; /* high 32-bit value for a 64-bit value Enumerator */ > +}; > + > #ifdef __cplusplus > } > #endif