From patchwork Tue Jun 27 19:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 113576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8437504vqr; Tue, 27 Jun 2023 12:57:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5asUzjEhqBmg/0tjB9vCOYRHxhtNFUu0mumX6O8kzEMePRX0vneDFkfLhlJMcE9AKJVAvG X-Received: by 2002:a17:907:25c2:b0:978:8a30:aaf with SMTP id ae2-20020a17090725c200b009788a300aafmr24497561ejc.64.1687895876123; Tue, 27 Jun 2023 12:57:56 -0700 (PDT) Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id pg11-20020a170907204b00b009875a4b9b17si4597512ejb.229.2023.06.27.12.57.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 12:57:56 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aXR3jHde; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 73E8D38346A7 for ; Tue, 27 Jun 2023 19:55:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73E8D38346A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687895732; bh=mck/iG7vP/Hg/sfeHQwitE72iiyipVCoup8YKQUaM/s=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=aXR3jHdetR+v+dumMmXkrJ3WCkhMDSzY7/eNRVLq2zUeTa0C5EWWZwcDTdXuHT0cT vnrelj7Z+DPMyTE9FZrr1eWX7KrZe5g9kLvsso9izc+638YDsem158oxvM+CnSiiR/ uSFSLT7zeO2Vt44Hcjk62yFEL5LmDOIJoxruADaE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 6BBEE3857734 for ; Tue, 27 Jun 2023 19:52:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6BBEE3857734 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35RDZwfs026393 for ; Tue, 27 Jun 2023 19:52:33 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rf40e44ua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 19:52:32 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35RJpKQ0019935 for ; Tue, 27 Jun 2023 19:52:32 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpxas33x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 19:52:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BfxeBqQEM1DOJoJLW2cC9dJwFnYloel+4odjD3DXgBFs+P9nzmNfpSsA1mAsO3cERQdqTvJnTsn4Mj1GA9ZnF6g9waabooROhEa9YAb2Ctwr2ARRjbBlZDcDzxZviCoJg4tMtYgku39immEIkpeU1shIEHEk1tc0pjq8bZPzNUQD9zEsVWUGjY7cqVlrDAwp0wpplVKssbLMIOS4vV6xcsYDKaOoR53yapBLyaVoNYNAZEfHqe1ewUKMARA5Br+am2SdjMr4I1JsUySClDJArdDl54G8z/FNyt+RVC9rbxjlY3IVOnAwRWA64eBFFUPYfKrF/xQWBjfniWesc7X0CA== 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=mck/iG7vP/Hg/sfeHQwitE72iiyipVCoup8YKQUaM/s=; b=VS8QKN7Ja4wdCg48/WxjKvB1xmYBBU/U+MAPn4pmMQfsf2UeAOy1Biwjo4eQ8lOIPZSr5eBn0LcaDQfNHVG9xTA0kzO2Hy4DUq+4cB8fRKlUGWbatUBS+PD4K8W3jzwgq64Tpk3alZ+ulV79sCSeezzXPbcP9WTgUqd+6pTTgN2BKe6EznBkgdUjNthaqEyDVWnQwVs5U55QaQIK1KwYXizrMj9M2ERUVOlF/og4Tvcl37qlUvRQ1JCP9ttvoUtkeRWUIRn7wJMMbFmMWiVXPfAnUnUsW35QmIWDsRaj9TMbMzP0r25qfCyNpBidRIBgZAREpJNFkWsuHBLkbT5l7g== 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 PH7PR10MB6180.namprd10.prod.outlook.com (2603:10b6:510:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Tue, 27 Jun 2023 19:52:29 +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.6521.026; Tue, 27 Jun 2023 19:52:29 +0000 To: binutils@sourceware.org Cc: Indu Bhagat Subject: [COMMITTED] libsframe: bfd: use uint32_t for return type of get_num_fidx APIs Date: Tue, 27 Jun 2023 12:51:25 -0700 Message-Id: <20230627195126.1955051-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627195126.1955051-1-indu.bhagat@oracle.com> References: <20230627195126.1955051-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR04CA0104.namprd04.prod.outlook.com (2603:10b6:303:83::19) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|PH7PR10MB6180:EE_ X-MS-Office365-Filtering-Correlation-Id: 305f2502-6134-428f-0dbc-08db774809ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L3jNPf6mMKwBzPGjL8/NxWWXZJuzly+N/xSGDPmHAKkzgFnbpewdFsxSxsmbxRHeteB0wmZI1pHEWPxRqESXoIOtDZJk6mKgMrUNepKPT0oXRXaxeVVU3zXsYo7GOY2Z7eTCABR9a4IE8G8BpEM7yfEmNaC7RscKVzDTl0Cp8Yd+cWydTQV26Pc22gplQ7H0txWYLnLZlyRQZDgtTaWEtUlP1UrbeWzBOk1VX2P3Pyeq6fyba3wHZ7Fv3g1vCOfNgdi2PaeaKA3ty/BqdyFsQsdD/1ptXYZfkCp56ufYejUjo0Al859mWrXt9YQT5fBCACSVNKabImpJyGxM/RfRXFI1M0J1LMCiIyfeuTHWIrCsTv4GPI0FiKR02ovetpy93A1OapCJN0jjQ7INcqLGZ3u5l53NH3MGQJjGceN7RD1ud5PCuTQYYzg0HX2cVnzyTW57aWKqq5UAiTfCcIRezOdVjCJ54NAnFhZE42D57/FdVl5vhKn5j+4ow40fmJoYPyUiaEcgrhd7hmuaLv/8iw/hb8XJcF9naTRBZuSDh8fAcroZx5oGVZvpx+Sh+Sse 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)(376002)(39860400002)(396003)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(83380400001)(2616005)(6506007)(6512007)(6666004)(86362001)(26005)(1076003)(41300700001)(316002)(478600001)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dZlbOH/y4OvU0qN+1iJUlBI3SRABpuIe2eDoY8OHjN8/Vpu4Dq47mSJVqkm1AehJ2iyuu4ah5lvUygxXyt5a2LmIHJ6sUcYYQbOLOdNfAIYfC/DgluK3rtzhNkiS5KMy8kg5iKA2StSP6u+A3uhGy0pXOetor2bl7UpufI0b4qKsR+t6I2foxKa1LC0AQBMnUUstaak1vcRpRfiuHvd2TQJWt/HW5wIkyoSzgBmckPg3ye1wgCHM0j69Ocq/SSWUWUJgho+DHJSX3xRgrrIh0nberB8p5gA01pG5f5L8k4ZjwMO+8wM6t4tb/E1lEdGP2Rqw1DIDNuTCdp1FSOWkZSBXdZtZ0UZTMvcYW6bLHqqF/uFg43Pr4D8FTwZsFUPKt0qpTFl3lV34OYhPDCPWYDuPX+Eu+9NTgttE4yqxA+WivPrtuJQ1opLI5t4ptVyG9fqmncuVZ44GIjh9KfSsAY06nWPVN5W1MLaBOxADZfNOeJfIPriAyE2L9BxH+/01T5i//74WbP4dL+nTnFRzBj9gQvYNfWCfY7s5rN7kKn7tWFWXzTGzGLRchXPPiZkfYxOwfZz3vMHUjoJsAIsIxwvTO9WNpYuQnPI/gKpdy7E8L76ydJKQ8jRx63btUeLf+Z6S6rcOFDjV6PdGZeasvkkokXGRE77H7BJJDpTepAz0dZXXm9O/3ZBvvTFB1MsJc/qB1iNcOn1dMSeJL4bsEvFOMmAQi9hIfgsSdA63m7b7jqHdgU4UJfaHxLpd3fFfaNpYybpOb0VvIKb0q2KXoPrxOccdxdBQBOJ4lf2SkaQiPR9P7DGXNuV03szNZH8K+FGh6XhxLm+6wcBonxKMW+lrIMHw7OupHtLf768iUhCit21nIpYVgK2Kk+D0e1GjD2oJNxxb45KdlFSyyLGk/MZcOuEtmikFoXyppuf1eOirR+NSZgamU85WvVslANPVja0R1S3c8MjHtImTu+dUlBqt/4HtqIod+8OdGY6dntGZlOLhh/gyoJY70YXtUDqUXzl1j5igv7UYTHPovvCVVZp97NNOVkeyJ8HEM8Zqq9LTn8sbitvRkxcMxpZ17/uKaevlFRWTMu+lKyHpBChdduCbPsbTOooQG5NkH24BjNYfkJ6hZJ9F7h4cjYsLWrI1mfeaN6VHO1ZGBOCNRjVeLSbDDovuHWKYZsMd7djkcW4bht8ylikXqwZee6+5+FfdbjTRifJ2qPseUDD1AdCN9gpvse7MKSHGSyI3N9B/V9/97UpHGSQ2T0O+lHW4ZAOHAa3hqUf8sLdC+HQhdTy9G+xFRnc2IxCv5eooOnktMoyTQS0EH3T21UAkIkpD1ELIT8K9hArajLxWmxmUBrsEW19QkiYY+tmLwoQcTgKqJfeUFdeszHFFHNJ+Yao3enPgSgpuyLNCFFOKHQguFUgLIbY9PC2arnlRfUBkpZrQDHQmmaJvOh5ZrEfKbNEve/3iTTdwr40ZrTmutxuqzbDjllm0vBMqcCrXfKlJO/wTNXsL2ocZhoYZz6/n6W7b80y4AI+r4DrLNzZERofBEycmA+Hx3+pq0yLURjadxYrxoA3Mekk4zGgklMZWAJmkGbhm X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: S6ty2ccrFXV3248Usg29C9yH6tfECskWDjvR+jrgbYi8rv6g6maT+7pozck4sB259cVy9IdODYaTbkE4HEuOW/SXjMpI4Sn8tYbinYP2bFFnUM0Y8f6o0PRBbgJDdmMjTv9YxakE9OtVTClkdNoPx6f3RmYdN7F+qPX/z1JSSunG+1wuogYZJ02UHDE+2jYPlggUFqDEEMut3y6+FV/mhLNTxxCyfuWzgF2lSzRHwDJ1sN5mKg3de4k5l3n8DEqXRrKxjBXrQP1H++vEjhlCC/ESGBYvYvmLH2Lnk9yfrKjaTiRXtB2CwTW2yam9l485E5x5PGi/8Gin/EGp/p3tpL/Csk2cZKImNmdgtJ77JM/srsB00arSK4UGITeJUDBthwWnLNRkF9m2gphzw2SPR2BruURfZHDdMapi9DaKpVPl5dbJNhyMi5Vzmo8GMGCKcSAJhY2peA2H+fcfIJi4/pWLk/jFWEFpkL0qE7VCqD0kA/EIyUFjDGwOxyLHg9f9ly8q1fDf9qZPBcPEsvFc8Tb1mKqaSW6OMhUwFGsrgK5FFUePpLJDoswNOGp4OFLMcEEntlTbTmdJCFv3a8/S/vtXkIFxscByCNRSIv0db3z1uwDcDsosvZbD1bRfbGJkCobj6Y7zE6Hze2bWH1Jn2WKzgALQ53lQPJ00uU33jsyavSMHffelBL4tgGlMajyrtcM6opyJEmykauM1VOLE6QeBluABkWGsI/DTcO61rlE5rxSZg09WmHu/PuLppE9o X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 305f2502-6134-428f-0dbc-08db774809ee X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 19:52:29.2838 (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: eGbb27iEBo3nHgY27/BEuI46Lz9RHrOIxr2BFUdPqQ5bRvX+AcSMx5/xy8OlAPXgbV7tKNtp4n/gvc/h5rzmlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6180 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-27_14,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=982 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306270180 X-Proofpoint-GUID: Oi9QmPdTJ_dL_7KsEJ0R2u4wIbkCDokR X-Proofpoint-ORIG-GUID: Oi9QmPdTJ_dL_7KsEJ0R2u4wIbkCDokR X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Binutils From: Indu Bhagat Reply-To: Indu Bhagat Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769887106175520578?= X-GMAIL-MSGID: =?utf-8?q?1769887106175520578?= Keep the data types usage in libsframe look consistent. bfd/ * elf-sframe.c (_bfd_elf_merge_section_sframe): Use uint32_t type alias. * libsframe/sframe.c (sframe_decoder_get_funcdesc_at_index): Likewise. (sframe_decoder_get_num_fidx): Likewise. (sframe_encoder_get_num_fidx): Likewise. include/ * sframe-api.h (sframe_decoder_get_num_fidx): Likewise. (sframe_encoder_get_num_fidx): Likewise. --- bfd/elf-sframe.c | 6 +++--- include/sframe-api.h | 4 ++-- libsframe/sframe.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bfd/elf-sframe.c b/bfd/elf-sframe.c index 069f7564fb4..013a892e08a 100644 --- a/bfd/elf-sframe.c +++ b/bfd/elf-sframe.c @@ -403,10 +403,10 @@ _bfd_elf_merge_section_sframe (bfd *abfd, /* Iterate over the function descriptor entries and the FREs of the function from the decoder context. Add each of them to the encoder context, if suitable. */ - unsigned int i = 0, j = 0, cur_fidx = 0; + uint32_t i = 0, j = 0, cur_fidx = 0; - unsigned int num_fidx = sframe_decoder_get_num_fidx (sfd_ctx); - unsigned int num_enc_fidx = sframe_encoder_get_num_fidx (sfe_ctx); + uint32_t num_fidx = sframe_decoder_get_num_fidx (sfd_ctx); + uint32_t num_enc_fidx = sframe_encoder_get_num_fidx (sfe_ctx); for (i = 0; i < num_fidx; i++) { diff --git a/include/sframe-api.h b/include/sframe-api.h index 9cb2db0edb9..7594011a48f 100644 --- a/include/sframe-api.h +++ b/include/sframe-api.h @@ -122,7 +122,7 @@ sframe_decoder_get_abi_arch (sframe_decoder_ctx *dctx); /* Return the number of function descriptor entries in the SFrame decoder DCTX. */ -extern unsigned int +extern uint32_t sframe_decoder_get_num_fidx (sframe_decoder_ctx *dctx); /* Get the fixed FP offset from the decoder context DCTX. */ @@ -219,7 +219,7 @@ sframe_encoder_get_abi_arch (sframe_encoder_ctx *encoder); /* Return the number of function descriptor entries in the SFrame encoder ENCODER. */ -extern unsigned int +extern uint32_t sframe_encoder_get_num_fidx (sframe_encoder_ctx *encoder); /* Add an FRE to function at FUNC_IDX'th function descriptor index entry in diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 40927f06933..29142436b84 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -349,7 +349,7 @@ sframe_decoder_get_funcdesc_at_index (sframe_decoder_ctx *ctx, uint32_t func_idx) { sframe_func_desc_entry *fdep; - unsigned int num_fdes; + uint32_t num_fdes; int err; num_fdes = sframe_decoder_get_num_fidx (ctx); @@ -1119,10 +1119,10 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, /* Return the number of function descriptor entries in the SFrame decoder DCTX. */ -unsigned int +uint32_t sframe_decoder_get_num_fidx (sframe_decoder_ctx *ctx) { - unsigned int num_fdes = 0; + uint32_t num_fdes = 0; sframe_header *dhp = NULL; dhp = sframe_decoder_get_header (ctx); if (dhp) @@ -1337,10 +1337,10 @@ sframe_encoder_get_abi_arch (sframe_encoder_ctx *encoder) /* Return the number of function descriptor entries in the SFrame encoder ENCODER. */ -unsigned int +uint32_t sframe_encoder_get_num_fidx (sframe_encoder_ctx *encoder) { - unsigned int num_fdes = 0; + uint32_t num_fdes = 0; sframe_header *ehp = NULL; ehp = sframe_encoder_get_header (encoder); if (ehp)