From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 6F6683858C55 for ; Tue, 20 Sep 2022 19:32:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6F6683858C55 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 (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28KJPKEH027466 for ; Tue, 20 Sep 2022 19:32:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=message-id : date : subject : to : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=ymXV+NyFqs476jOeyyXnbDuAMfVIVHq6Xw2Q9Aq+hq4=; b=ZwIPXmhl8lDEuAxht1u94gshPaSL+bOFz64IHwXQgvryaq9ojcm+H5IKSx8Z0mtuyhee nJqetrdoF4nYKKmtVJCU20lHVhUarvInUQ8iSX493K1V0euDs/eo2Y001xwINhKSCSlw bJ4rCWSLaQQFwrk1Kx5b4A2IKbpHwL7zUtI8JFxakbiTQh5LLtVTcSGCWhG9nNhgxLaj NLIzxIZLSsprSOzRCnj2QjniUQsmqm4tIoRHoRW5pXHJifZ76yjXy50oCJ8uiIJ3zTob bP5DK/FNHpF43MFM6IRW7Lj4ilgyPO8+ysvilBHJkQzG3Efu253V0NfmUg1dXrT3wd9q Qg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3jn6f0fuhu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 20 Sep 2022 19:32:52 +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 28KIQi01027908 for ; Tue, 20 Sep 2022 19:32:51 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2177.outbound.protection.outlook.com [104.47.59.177]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3jp3cnnqpq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 20 Sep 2022 19:32:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJau5bw+Ks9b47hmuTnPZ5t1X26WwUJlS//Oa4KCVVd120q73NaKaGBnMsCObBAbX593fUd7wADhxhg3KhB/YyfkyDEIwYqyxO25rb6Qz/UdkMtjU546LE+Paly5SxlYfNFRflJvOZTqCgQFwGC6yc1fEHfXUH1ZuVWrC2+PJ8hfr1H92ipBuSBbmDDDNvS/6+WQPWL6a1M1heBJU0ZFRNIVvd41SJLJmg1C4at5x4CpwyHTJOC6/vNrWVrH8ouSLIC/0jIf0k3SAhw/1Bo5C7e3SO1UrhqWcEhxVe75TUjWEK8CPcYjBSBchhA6vFV8NKCuBrOwPtm2T24HAfDrrg== 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=ymXV+NyFqs476jOeyyXnbDuAMfVIVHq6Xw2Q9Aq+hq4=; b=NSJte0YuqDE31Ed7JnW5RljaaKWsSriWqSckUV1VO61KM6J7JoU709tccWqvRfqM2s6DtJ2pWFtcSPxT3mbfi9tNl0MSvUBKyXjzHHRwQ8HjcvAA3RDN/WGK6kg8BtYc5Fea4pDNU+HrJDAgxM9sL2J8+wpKt+6f7gjjFVeDFuUsa7YAijikiuc/SR0WzjspJ7lefoLguCGbwCqI9WxaFkhjvfa3XGXubcHuR0JagLN18AN93/J8Lxhx9q343O/V65P7pwwJun4smt9SuLUPJBg88LvbIAm8U2KxL2i24ZwB7PpLU96o81jYVeQ8Nf7O2iI2JiICInBhnPoY8rt/IA== 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=ymXV+NyFqs476jOeyyXnbDuAMfVIVHq6Xw2Q9Aq+hq4=; b=gpe2dBZEVhzjRMPKhNWcim71ph6E+0/2TRYrLTYk5gyxyS+722tZEX/zfyK6MKxTVlseGQRkNiyIaemI5QUGhiyYj01LwtZRmi0xobkOQMtqnyKVzTpsITK7z4LhbKoikfSnGXiYbPExLiYUVwLFPSfRouH1Z3ceq2fz+cJ8R3A= Received: from MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) by IA1PR10MB6195.namprd10.prod.outlook.com (2603:10b6:208:3a5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.18; Tue, 20 Sep 2022 19:32:48 +0000 Received: from MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::18e8:e5f2:59a9:1ff5]) by MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::18e8:e5f2:59a9:1ff5%2]) with mapi id 15.20.5632.021; Tue, 20 Sep 2022 19:32:48 +0000 Message-ID: <07303867-5c97-e3ff-ad14-e9261b9b2e87@oracle.com> Date: Tue, 20 Sep 2022 14:32:44 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: [PATCH] btf: Add support to BTF_KIND_ENUM64 type Content-Language: en-US To: gcc-patches@gcc.gnu.org, david.faust@oracle.com References: <20220829211106.427267-1-guillermo.e.martinez@oracle.com> From: "Guillermo E. Martinez" Organization: Oracle Corporation In-Reply-To: <20220829211106.427267-1-guillermo.e.martinez@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SA9PR03CA0030.namprd03.prod.outlook.com (2603:10b6:806:20::35) To MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR10MB1407:EE_|IA1PR10MB6195:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fd0d1ad-c5c2-49ad-a6a4-08da9b3ee676 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: juRLWDmSIyD1B1fI7C75YOgFVpwHnzEqLKLQm66W2DEA14ZfwVkULOMeGAKSy3V2Z6J+RkCqdLyaRKAwUOvn9+mwOANj8VXs6VYY+7mqqvK5EIaPK7rtBnFjkDEhwxooR19LcEcWikuNBIgVYGnIZsTtNX4sURynnppFckG75rDNMB4hUg7QWHWi4zRUlow6imjjwv1+y9xHLjH41XDfKJkLH4/naSbEEIvQmNNE3QGW2K8y3XlDem3Aw/SLzuAXTT/PZEMIiFCdURIyNkl3Yv4djrp3GcusvAleDymp1rEh0X9AKRj1eX7sa2cJTklR8jOkeSP3DPRZ7C2wwATJTsKUe6+fYkjQQ8LehXhHdLxZNpI6PUiQHg5gOjcGEIBverPKebZ1JDmFNETlcHdmNBcW0uv2ccAhduYdnuKw3RlpF2IU5rdNmhox9tAVEoeD0XjL8qt0t/qx+fbrB8KFafXmb9HaQoXG5eopJt37jm4IlQub1CYJPFHBVAUgwSMRZsQVbfcvbtGtnyME2xVE2wTsZXNlv0Y9hXN1wFHd27Bj1Dp6SonUltkEorS/XXM8wx4CNkZ2Jrx2AnOBs6XUFCZ2bzBDyCRV9c36QTgn4EPEAGguMUFkSBqLAbK2ExJApNKQPruAQVV3rXPstIiyYwr2y2bpygkMkADk1GanN7ElUu/g0LxiS4bBahwxjNPzSDowlW0y50wTeWfKFtrWUFoZRvrSINlQneVoWxQ0t9xhUzh4McQ2+wJB1A3F9qjyG3p/2OT725TZkz6a/V9VbKTLBpYheELfum5ec25Xro4F1/Eu4G5yFleKUznBGch9IwXjGulNeL+W+jOPS5XNhlSSKhX36nCHsd0C7GsLTBM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR10MB1407.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(346002)(39860400002)(366004)(396003)(136003)(451199015)(6486002)(478600001)(6636002)(316002)(5660300002)(8936002)(6512007)(30864003)(83380400001)(84970400001)(41300700001)(66946007)(6666004)(66556008)(66476007)(8676002)(36916002)(86362001)(53546011)(6506007)(2906002)(186003)(31686004)(38100700002)(36756003)(31696002)(2616005)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M29OUVk5WmNsYk55eXRhVHI5d0NGcXpwOVZLSndjSnN0TStKSGUrREN2d3dK?= =?utf-8?B?Z3NpVkNJbTJ1eUVqRU9tcVo5dnFEUjVCN29yZzVaUEY2dWtERTc4K0xFZUdi?= =?utf-8?B?YnVpV2lqUGowMXdsWFlxU3F2L3RZZzlvL0xjZkFPMTE1YUtLWVRLRmxaaVRv?= =?utf-8?B?dGV5SllkSXQ3eHV2MFdjS242enVjVXl1SGdScEg2OFU5Snlha21SbnQ0SDc4?= =?utf-8?B?SngwVHBmQUM1NlBiYUdvbnFMaWJtZW5SRTBuR081bTcxa2p1RmpWMkhOdENl?= =?utf-8?B?SStMWnZTN0VLQ3VzeStGY3pnSS9aK1lHZXNiSVdTTlBNTUZNWEkrSTlhSGk0?= =?utf-8?B?VGxid3dMKytYQU1CWlJTZmJxbHh4SnJUdkJ2eEV3ZEtrMnRDSmdYd1RzU2E4?= =?utf-8?B?a0ZmakVkeVhQRm1xcko2UUV3anZiN3pqWk1pQlBEd0VlY2RMdzBjSWovdFk1?= =?utf-8?B?Nld0Nnh1amF2cVZ0VERJRk9Nb05aTXJJb3BHdGVnNlp1SXFpcGU1UTB0bjlF?= =?utf-8?B?azd2cVBpcmhFUmNML0xHTFh6cllsTnlLQVlPN01vVUU3d05rUmk0UDgyNDAx?= =?utf-8?B?NUJnUWNBTVUvV2xkdTBHSFFYczNFbXljNHBzTHloNno3YWM4NDlYSHh3S1RP?= =?utf-8?B?Y0s5dXc5cXlqZ0pKV3RZZmJnQlk0UzNyMEhQb2lEL2tpSyt5bDJENUlVZjly?= =?utf-8?B?YjFWa00rdE1DZVlDWDlpVTBWVENMWEs0cFp0enV1ZGtuSDF0Y0p6OTFodVEy?= =?utf-8?B?V1l1RmRXWWxqMy90eVFNTG9ub1ZRQjlSUjVrUTBxWXc5NjVVSHJrM3ZYUXdR?= =?utf-8?B?UjdrVXo1NTZ0aEV0L2svZjRFMDd5M1h3WTdiTG91MTdweUpvLzlUcy9Rb2w4?= =?utf-8?B?aDhjQzRsazRWWWNXc0UxR0RZUFhhT2dBc2J5L3UwcmZtUTN1Q2JmV01ieU1O?= =?utf-8?B?TnhObWpCeEoyS2lDU01mZTdkQmZ1OS96bndLcGk2SFBnUUpBd2JBcWFsU2N4?= =?utf-8?B?R1dSakVpYlRMZUcxRm9GRlVyNktvODNLYXFTMXFHQmZRWStsaEQzcU1JcUhU?= =?utf-8?B?N2FzR1F0UDRHNVV2Q3F5RU5rNExTUUQ3bGw0OE1SaDBUNXYzUEFyZ09hSGRv?= =?utf-8?B?V0ZDRUdoRkxzT21IVVl5NGVaM1dMY0ZGdStjTlN2VWxwOVl3WTdabUNJcUZG?= =?utf-8?B?M2l4ZDdSR1R5MW5QVHRvdmd6cmVGNFVCNDMwVlgxS24ydExzcGJxSFlZek1h?= =?utf-8?B?TEtxdXczZHN2YVQ3UFp4WUdFNnhVWkt0dHRUK1BWWFd1SEZIWHo2Nndkd1dk?= =?utf-8?B?WnU4WnRycmlaaXlZcG5EbHcxZVZHczRFc1pmRGdWOVgyYjhWd3JVS3pPNktm?= =?utf-8?B?UGg4M092eFZERS9NM0ZsV202b1Rhd0oyc3E4NUMzS0dZQnZ1UGMxQWJXd2wx?= =?utf-8?B?aFVVVEhFeFJBbDJvSXN6Rm5QUEJBMXhWa0V4ME5xMHZJUWVTWk5WYjh6Q0Fq?= =?utf-8?B?am5YRjhObzJQdUxlblU2cUd1ZUFHQzg5ZHBUV3dMcStWaGRiYThKdGFwdTJT?= =?utf-8?B?M3BaMW1vWGtsQ21RREd3djJpYzlIQTVDazBNVmZSNkYxS1NGd3krWnp5Rnhx?= =?utf-8?B?WXY1NjJ4d0YzTWxNMGNGMDU4cW13cWxWa1ZTZDlyUG15c1g4STk3R29LNkI0?= =?utf-8?B?VFNwL1dWRC9FWC8yNDdEN25lUHhNWkpVT1FhYWwvTUljTE9PNG9zYTVhNXZH?= =?utf-8?B?M2wvdUplTkxUWHRLQWMwZ3QyaXdkblhPbEpxdmNnQnV0TXh5cndkZFFIbDM0?= =?utf-8?B?V0FDR1NuejVzNXZLN3NrZy9IbGVWWEIwOEREVjJ3c2hyZHNZbEIxdkNmNEJ1?= =?utf-8?B?bm11NW5xR3lxMnZ3Z0w5YmpSSXI1Wm5lWU1CWXVEVkhFNm5GWE5rV1pSeXNa?= =?utf-8?B?M1lwNTZQNk1YT1VSaFNPdnBQNnE5ekZmZzhuYitYeUdPUHM0dkJITWFHWDV6?= =?utf-8?B?NU1HcERvcjliaitnWXA2OFhzRkFLcFdPOXhjRGdnbXdoaHdOV3RvVWNOaGlK?= =?utf-8?B?alcvLzZsYWcxYk5nL3pkNTBOdjcwVkdKRVFVSDBaYU9LYnZnWFp5S0UzUnA1?= =?utf-8?B?WldYZnByRll5RWp4ajBNN2ZJR1FMbTl1aUxWdEhHQzFvMTNUUW1jRytKV2F5?= =?utf-8?Q?bywefXcY1tppIPIWXq+cO21mZPFiVzOyB/F4ee1JbsE6?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fd0d1ad-c5c2-49ad-a6a4-08da9b3ee676 X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1407.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 19:32:48.5347 (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: +mJwpthuXOaUn7B5/Rv9p5SUyGvLpNttIDHDMOl/JRrl2ysqAHoVMzyVbDYGH4fR63iavWuKQBw8Wcm1IVMlQSOM7Xn7mEPRHEf3syEoygM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6195 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-20_10,2022-09-20_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 spamscore=0 adultscore=0 mlxscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2209200117 X-Proofpoint-GUID: A7a-xpy-5qy2zD2IipiwTBLKUM3x80-n X-Proofpoint-ORIG-GUID: A7a-xpy-5qy2zD2IipiwTBLKUM3x80-n X-Spam-Status: No, score=-13.5 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: ping On 8/29/22 16:11, Guillermo E. Martinez 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. > * 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. > > 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. > --- > 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