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 597613858D20 for ; Tue, 30 May 2023 16:45:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 597613858D20 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 (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34UE4svx008456 for ; Tue, 30 May 2023 16:45:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2023-03-30; bh=GLdWLDfG93ONBOEEpzPQA5VY8bhoLrnHJ7D0W4fc/8I=; b=rfa90jF6jlRl2lWXc4V2qAJAIbXr7T9Jr7r751LLB4ngnRUk+/jwSfBXJ+UCV1zEtecR zoXcw1k5juBWrYLh36U/p1oJ887PGxDnrEwzCCDrJi4A1Abkkz2gwCBHeVHMHSRkwR2H S1M82kZpIVeJ02ThNjUQ0pLS7SVhUK0fkqibodqr/3SpgHCefsZwPpJkZw7IeOSjbsxX NP46nM6RZ0ECgvs5atQxTnQIhGkrwtUyET/jRg7c8axjefkLJldMecEGc/n+IEpn9STE W1P9xlsqzIRhfuV00smGEesj8fw0Tcy/LdCJV/71T46iaNurkNtvrAdqbjR+uoASbJlK UA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qvhmjk8rj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 30 May 2023 16:45:30 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34UG68s7003757 for ; Tue, 30 May 2023 16:45:28 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qv4ybrb19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 30 May 2023 16:45:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S9cF46QZtA/XPkLCJp6OBKJnDCcYteZMJkYd4koE+xsjABI0H6DcFDe5hV2i0NhnHrNlhXGT8+GiNnc0qEtqiQSwtarTjB1s6l8b4J/dNnef5UIs3Dp8sFD/dQgmUPw7lrvtW4Std3B4naH4iB6rLXh9SeguIw6UmzBBy9tww6Hw0Th8L4lqlwMn/TPC4HHDlOGiiHdLiDvpfdy01/Fm2o+8EH5pBbNX6ENlBFNvFHk/Khcpx4UwObd14DBlwWkGbCLTExLSlAQ3vaG04zmwarSuzLlwU+O0Qe7PZIxDk4HaNf56J3Jj83cSN+fyHw+UGmkuFEIBTHyfbltx9HVSdA== 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=GLdWLDfG93ONBOEEpzPQA5VY8bhoLrnHJ7D0W4fc/8I=; b=mXyUe2bRYH8WPhnkUjNWbbGjnBFZnfQ/Dm40rzs8oBJ2eRchYm2vYz1zuiKsk58yyc9/DjTUm7JfO6UJ66gzIlrvH6+BWj8VvrOJ7car9gQLYYiTFF6jdYpOaBngDxAEj8NoZKKggeVLwqnzFDgWsj0ckc354sWOdbOnjzSVAF+dD2o/fSeVOJbiJZnN12bvap6xSVHbpKPXWBOBPquADTZjUEHZpwRszpPqSLOLIUKO3kRQQb6Ydzi0y1M/Dwd/Ohz5gI4QXA9sGA9UVk1zr12104UeZXH8GNaFIGKWL3GuYcXjW/uJbYoX3R8vy5adP9vZ+hz4FiCltGUxjFW99A== 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=GLdWLDfG93ONBOEEpzPQA5VY8bhoLrnHJ7D0W4fc/8I=; b=EQ43BvR86lr3+9CggXsLOtIwMM846EEmLWW40kg/SEaCR0g9buCl8FfMEIX3kga+B6ZAF+vpMUwCmdNy4eRk24YbtcM4XM23/z6O7smApO5Z+WNfkzZyjtymCvU70YrIUjAGNvSEuvqo4dsRM9zhYMC8fExLSblDM1k8NBUmOEk= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by MW4PR10MB5775.namprd10.prod.outlook.com (2603:10b6:303:18f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23; Tue, 30 May 2023 16:45:26 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44%4]) with mapi id 15.20.6411.025; Tue, 30 May 2023 16:45:26 +0000 Message-ID: <90d3ea32-039a-ba66-1341-bd39aceee064@oracle.com> Date: Tue, 30 May 2023 09:45:24 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH] btf: improve -dA comments for testsuite Content-Language: en-US To: David Faust Cc: gcc-patches@gcc.gnu.org References: <20230525163740.6062-1-david.faust@oracle.com> <47a761a2-a684-7560-817c-d0f5ff53547b@oracle.com> From: Indu Bhagat In-Reply-To: <47a761a2-a684-7560-817c-d0f5ff53547b@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MW4PR04CA0187.namprd04.prod.outlook.com (2603:10b6:303:86::12) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|MW4PR10MB5775:EE_ X-MS-Office365-Filtering-Correlation-Id: efe8c7d1-21b3-492e-71ec-08db612d4535 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oeiux4cwditlYWp6eeJcmIzGaE+H/YwHoasziohpvwlSn7O7x5+J2pF1HFcY9ZYawk8HP6EtFKPndixtm3ESmjVEDb03Bhws6aflUTFUtE94+iXdwL33YbKHA0dOUB9IYSEHzS0YKBSp+NwsYvmuib4aDCMDFpJnpCL2vfNf/rzrMKd2EZg17dM0Ijw35E2wc7tI8VMzFhNn2ka9vEWdzQF5MPlDSKba/DaIT1eK1+s+DHSEUBHWduEITET3z42f/pbF0Fw4RYaN0w+Q250mR71q67pWnj6Un1rIqiu16VpIy87Yj2ajDbWX1csBt1iLUEcOigAFsIlFgJu4iEF3EPcIbFsV1tQVNBWUOoZMAfnH93EQDiKovaLIFy0X4kJBlJr3Igb6TaCbxlDayhxNt443LF+NtcOE9EFMImVeAO5gSvOxn4fvZtSyqDGTqEYpv+INHmlfwNBTUaITthCPa6LLyivNj+NT7Vk8NAmgsjw+fBK2h7jjQ9JDevNiE3N6dHw6zELhXxx7YcLxJp5Ki4v4RUpUrXQA2/u5fcEG1Nt0lylqBNsua+dEmZRd1VPwkxcVeS+aCc+cvhLYEQMOwvIfA93QVKzEG1K9sXXCvdVxPyb5XPUzy96Yno8VrsZSrWXzpwdayPqJOuXwiaLucg== 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:(13230028)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199021)(31696002)(86362001)(36756003)(6636002)(478600001)(4326008)(37006003)(316002)(66946007)(66556008)(66476007)(6486002)(5660300002)(8936002)(8676002)(6862004)(41300700001)(2906002)(44832011)(38100700002)(2616005)(186003)(53546011)(6512007)(26005)(6506007)(83380400001)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MWl6MFk1UzNRUTVTTVh5NFRwNnJZbklUcW1LUm4vQTNYa2lkZ1hOUWV5bTFi?= =?utf-8?B?S0s2QUZtTnp0Z1NEVVpEQ0VIeUtaQ2FuaFpEWXd2TVFGVWFtWXVUaG9YYUJO?= =?utf-8?B?WkdEcXpEYzF1elZhdHljbXN0M2RuUGg2L2VVQituOTZQQjhyOGV5a3lSbDBv?= =?utf-8?B?MFdjTUZuUGVoQllTdjRjZWl3RmRpMXNya0NsazRNdUJWZW8rYTFwUDlpcnJI?= =?utf-8?B?c0pZZHJhNXVYcmMwdnVCcnJTVCtGMVY5b0cwZ1FRSStOMjFaUm4wZkg3dDE2?= =?utf-8?B?UmZEamJZeEhCbkRGSzZBMXVwbzR3RHZUdXBLaUtOSGhnenNUWGZWQUVKV3lp?= =?utf-8?B?QVhMVUFHanFtK2hLVTRkV2Z0M2ZKYzNjbitnSzVPOVhHNGlESEtqdjQ3MWNn?= =?utf-8?B?aUphenM5ZmlpZ2Z1dDJneVExSkNqbTJnQzUxcFlsYmdWMzArdzU4bE9BeTBa?= =?utf-8?B?ay9yZm93Y3hqZHZxVGlnR0FZOGpCUkUrMEtoMkdUblZOREZuWmppdHRvZ0do?= =?utf-8?B?V0VRVjY2ZTNjRDdPUG01aHFBeUhaeGpvc2k1cUQvSDdQZUloTGxWRjUyK2RV?= =?utf-8?B?d3dFaGxpMnJtSnQyN3d1Qzg3bU9EdUkwUXl2ZVhueEYvQ2V2VFEvQStiZ1pv?= =?utf-8?B?MVFjZGNZYUhjazhReG1Gc2REU0ZTdzBwb1dUV0RuVk1kSGdEUWRWMzZNTmU5?= =?utf-8?B?SzdJTy9QdUI4eGhTUUJJSGFPbzFXM3RkcE5pVHgramFhemQxMnV3alVVZEJk?= =?utf-8?B?U21UR3VkSC9hcS8zK2FtQjBhWXlGWkNDN1RUZmxmMFdWdDAwdXdQSUNNY1Rx?= =?utf-8?B?eGJRSW9RZElCbFlSQUtCelllay9pdEoyeFM4emRrcEVXdVFhanZqeXF0TDRS?= =?utf-8?B?OWJsTUI2RGpkaFJLcFFGVXpHZ1F0OUg5cjFDWDlucHlBL2I2MFhDeUhyNW5X?= =?utf-8?B?QzBodDF5RXkxYVpGazNuWVdDZDlwbE1RSGtJMk9lWDNySWRjZldEYldLdGY4?= =?utf-8?B?WUMyTFMyOGRacWJac2ROdEZ2R0plYksxd1NTU2JZSVptcGZCTndWa2g1azBP?= =?utf-8?B?YXhwbTRtZUpUSy9hTVlqQkEwdXBWWEw0R2ZHeEdkYlF6ZnRvUERrSGJFWTg1?= =?utf-8?B?MEJveExSakJ0SktOU2g0cmlYS3FWMnhuTEczdjRsWU1SNWt5K2xPR1NaTmVF?= =?utf-8?B?eE5CcW55T1BPV0ZmUlllN2V2VzFFdjFJMElneURxSjduVGFYQk91SmpiM09h?= =?utf-8?B?SnNRWVcyKzc0RXBiZ2Q0OTd6SktxeWhWVWh1TXNlS3dkUkpzSnJsRkk1Z0VJ?= =?utf-8?B?VzdDdlU5L0RDTXBTeXlTdjdBT3dUQmVWYnloYnNxTytBTFU5ZlV0MXVRS2o2?= =?utf-8?B?VTZXWmpVaFU2cVpoeHYrUDlLcW94SERKdFhRUW81OHFtbzZUMU0rVG9PelpS?= =?utf-8?B?a3BUdURPYys1c2ZjaktJWCtWdUVMMTJKTDBWc2RIVnhpLzN1U2t2TVpLRXBv?= =?utf-8?B?aE14SlpWUmVpZkxFR2FnU2J6OVg1N1V3K1hIK1NMTElvT2libUZDMHpTY20y?= =?utf-8?B?bXh1azhReU10a3JrVFhFY3BGbDlnSjQ1WTk1UFlpZWZIZjRmc0F6emNXcmwr?= =?utf-8?B?Zjc0YVN5azR6SFp6bUlPbktxdUtRTzdxUUlQRFBLNTd2UlplL3hKWmd0bTlQ?= =?utf-8?B?RkRsZlk3WU1nQkcyMDdud0h4dDU4QlFwc09Uc1hzcTZPWkFiVE9HYzZ1TzZq?= =?utf-8?B?YUt5U1VjNzEwTGdDbkphR0NRelZTa3VEZkhyMzI4dWhqUEdmTWhBTjhSWGdV?= =?utf-8?B?cmdOcWNvRitTSXZkeng1NmVQMG9Xc1VnbjJzSnBJd0YvN211YTFNOU9nem81?= =?utf-8?B?ejdHdkdlbVhrTmx0SGtXdUxpU1lscGljbXZEZlR6Y2Qwd3RMZEUxNHFzMUhJ?= =?utf-8?B?NlVRV2dkRkgrMEVyMElmTlN5U0dxejAzZE5WTUVra0x3bnBsaExpcEVESUpn?= =?utf-8?B?am9Qd1dtMXBJeTZtRWt1dEx4TTlBcUYrb3NMTjZjQlNDOWRiVmZnZEl4bk5s?= =?utf-8?B?ZlkvbTlQamFLVTA1VHFjYzVjbGc5OEZySTNvWWV4ME9XTk9XZEhzMEhOdUJ6?= =?utf-8?Q?7fjz8Ykyrdj3tt2IQR9XwJW1j?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MgnvSigw8WS7PmjcNWzEWdBncn1rRnO7ffXxlTivmi1WEV2gWEeqV6uD0oUtX+OREia+NGou4bqb/Pq9XLz9YUHL2Ne4Gmaza4zRsyIyhRqUcMJ8rXwrInwxFtIlbH3/3PZyVR/B7vmxLEZMKy6BSWxuvtXnoxE2hXBvtCLXR7TRwH8D/K+z8pN9lVDkkhXaCAZNXePqfewo3K8um1vDM1ag05pQMifW4qkJvWMrD0FlJr4vNWC8fgZANmaHvpe9PKeRR7ixUWn5Pc5y8Vj1fs+DyKm00qOWUPubq9mQBZMUyMe1LIbt8ljNo+8cP8Bs6NiOyzD7fCHtQeXhzEwf1WtizENH4EugdgUkKEvj3VnvK1hWQI0ltx0rI0a4FM8deGJKWRrINtyvzoP0zYRRj9c0Wm/qF/XxboOqYikZLOIDMuHTijzslEzhyU5EjK3rjBkFkJHANNet1kDewuta11uMzd68t31dOi0tnXn7WoWZqApw+FmPyHGIK1BZ3gCASpRhYNW1XOkABax/nKf1nxd7ujCMwH3HSIY/C7ESynqp1kF6LGMtcuFrSTQxiV4H7R7XwzTNaFfP/IVFB95egbJ7mfLrVOTxn0I8uBLiokG1dQC8Ip65EV3VVXkp4luhv6vuRIjsfS+MTiy+Ro/XAynzvALKUzDyk6d5cgKKrA2cIMWFe+j3u9K0+Sn9EE8XmXlgh1G+GQi4LD+qVTJWB8OVIlgjYcWOPFb9BD37aqzv5r+rT4NJ/PxiLIix3oZY X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: efe8c7d1-21b3-492e-71ec-08db612d4535 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 16:45:26.7219 (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: 8B27RdyyWbRHpDy9ANdpV0fU5PhB0ZcWFHcPOfHEWOFeqtXkTTl1JXO6nnyHPySEH97fsB1/Lu+XR8b9wdiWSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5775 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-05-30_12,2023-05-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305300134 X-Proofpoint-ORIG-GUID: vDR8dhGFbMYYLHw4CQnQiXGC3-6t6_4U X-Proofpoint-GUID: vDR8dhGFbMYYLHw4CQnQiXGC3-6t6_4U X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: On 5/30/23 09:08, David Faust wrote: >>> @@ -793,7 +917,8 @@ btf_asm_enum_const (unsigned int size, ctf_dmdef_t * dmd) >>> /* Asm'out a function parameter description following a BTF_KIND_FUNC_PROTO. */ >>> >>> static void >>> -btf_asm_func_arg (ctf_func_arg_t * farg, size_t stroffset) >>> +btf_asm_func_arg (ctf_container_ref ctfc, ctf_func_arg_t * farg, >>> + size_t stroffset) >>> { >>> /* If the function arg does not have a name, refer to the null string at >>> the start of the string table. This ensures correct encoding for varargs >>> @@ -803,31 +928,33 @@ btf_asm_func_arg (ctf_func_arg_t * farg, size_t stroffset) >>> else >>> dw2_asm_output_data (4, 0, "farg_name"); >>> >>> - dw2_asm_output_data (4, (btf_removed_type_p (farg->farg_type) >>> - ? BTF_VOID_TYPEID >>> - : get_btf_id (farg->farg_type)), >>> - "farg_type"); >>> + btf_asm_type_ref ("farg_type", ctfc, (btf_removed_type_p (farg->farg_type) >>> + ? BTF_VOID_TYPEID >>> + : get_btf_id (farg->farg_type))); >>> } >>> >>> /* Asm'out a BTF_KIND_FUNC type. */ >>> >> Lets keep the function level comments updated. Apart from >> btf_asm_func_type, this comment applies to other functions touched in >> this commit, like btf_asm_datasec_type. > I don't follow. All those functions are still doing the same thing. > What needs to be updated exactly? > I meant updating the function-level comments for the additional args that are added. I saw that in this patch, the new functions added follow the style of explaining the args, like, +/* Return the relative index of the variable with final BTF ID ABS. */ + +static ctf_id_t +btf_relative_var_id (ctf_id_t abs) Hence, my comment. But on second look, however, I see that the file keeps a mix of different styles. This one is up to you then. It makes sense to leave out the self-explanatory args. >>> static void >>> -btf_asm_func_type (ctf_dtdef_ref dtd) >>> +btf_asm_func_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd, size_t i) >>> { >>> - dw2_asm_output_data (4, dtd->dtd_data.ctti_name, "btt_name"); >>> - dw2_asm_output_data (4, BTF_TYPE_INFO (BTF_KIND_FUNC, 0, >>> - dtd->linkage), >>> - "btt_info: kind=%u, kflag=%u, linkage=%u", >>> - BTF_KIND_FUNC, 0, dtd->linkage); >>> - dw2_asm_output_data (4, get_btf_id (dtd->dtd_data.ctti_type), "btt_type"); >>> + ctf_id_t ref_id = dtd->dtd_data.ctti_type; >>> + dw2_asm_output_data (4, dtd->dtd_data.ctti_name, >>> + "TYPE %lu BTF_KIND_FUNC '%s'", >>> + num_types_added + num_vars_added + 1 + i, >>> + dtd->dtd_name); >>> + dw2_asm_output_data (4, BTF_TYPE_INFO (BTF_KIND_FUNC, 0, dtd->linkage), >>> + "btt_info: kind=%u, kflag=%u, linkage=%u", >>> + BTF_KIND_FUNC, 0, dtd->linkage); >>> + btf_asm_type_ref ("btt_type", ctfc, get_btf_id (ref_id)); >>> } >>> >>> /* Asm'out a variable entry following a BTF_KIND_DATASEC. */ >>> >>> static void >>> -btf_asm_datasec_entry (struct btf_var_secinfo info) >>> +btf_asm_datasec_entry (ctf_container_ref ctfc, struct btf_var_secinfo info) >>> { >>> - dw2_asm_output_data (4, info.type, "bts_type"); >>> + btf_asm_type_ref ("bts_type", ctfc, info.type); >>> dw2_asm_output_data (4, info.offset, "bts_offset"); >>> dw2_asm_output_data (4, info.size, "bts_size"); >>> } >>> @@ -835,9 +962,12 @@ btf_asm_datasec_entry (struct btf_var_secinfo info) >>> /* Asm'out a whole BTF_KIND_DATASEC, including its variable entries. */ >>> >>> static void >>> -btf_asm_datasec_type (btf_datasec_t ds, size_t stroffset) >>> +btf_asm_datasec_type (ctf_container_ref ctfc, btf_datasec_t ds, ctf_id_t id, >>> + size_t stroffset) >>> { >>> - dw2_asm_output_data (4, ds.name_offset + stroffset, "btt_name"); >>> + dw2_asm_output_data (4, ds.name_offset + stroffset, >>> + "TYPE %lu BTF_KIND_DATASEC '%s'", >>> + btf_absolute_datasec_id (id), ds.name); >>> dw2_asm_output_data (4, BTF_TYPE_INFO (BTF_KIND_DATASEC, 0, >>> ds.entries.length ()), >>> "btt_info"); >>> @@ -845,7 +975,7 @@ btf_asm_datasec_type (btf_datasec_t ds, size_t stroffset) >>> loaders such as libbpf. */ >>> dw2_asm_output_data (4, 0, "btt_size"); >>> for (size_t i = 0; i < ds.entries.length (); i++) >>> - btf_asm_datasec_entry (ds.entries[i]); >>> + btf_asm_datasec_entry (ctfc, ds.entries[i]); >>> } >>>