From patchwork Wed Dec 7 19:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp376854wrr; Wed, 7 Dec 2022 11:55:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6EBprENZmHNQyqThypzwT32ffFk1dr0qQNDXTbCxllnyRx/30EuliyiQ/l1kb3v4FcFAqJ X-Received: by 2002:aa7:d1c5:0:b0:46b:a536:e8d0 with SMTP id g5-20020aa7d1c5000000b0046ba536e8d0mr30990124edp.261.1670442940114; Wed, 07 Dec 2022 11:55:40 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ca15-20020aa7cd6f000000b00463b0df4604si4464567edb.488.2022.12.07.11.55.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:55:40 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=gLeke1vk; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 229DB392B157 for ; Wed, 7 Dec 2022 19:54:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 229DB392B157 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442840; bh=dEJh2v3fu9xiTeuYKC1kT+nebYd9Jlrh9GHewRD6NdQ=; 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=gLeke1vkHtSxxJnQ4vXy5I5YrZvMGuFwwlNu/7TzhrtggYDJgn1mE8BVRtST7icRL Ij5ixATqx791OYVfjGmF2jBiZoN9R7gsvnBNmcaVqB9WexCaf0hIxXa0s+dd+gjFBN gKTnpeM63egIAHL6RTI8lu8STKEzoH1rXVkuMx7Q= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id B773C388B6B1 for ; Wed, 7 Dec 2022 19:52:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B773C388B6B1 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B7J2NKa016142 for ; Wed, 7 Dec 2022 19:52:43 GMT Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3maud719pr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:43 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B7J31WM001973 for ; Wed, 7 Dec 2022 19:52:43 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3maa7cuduf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j4XGvWl6HZT7RdXEbiH5e0cOQIYCyZvMDcVZXTNCyYFyYvA1YtYESznh63+e+9QmhBQP2k4Njz4avQI+0VPWoTd013LBgsQz5X8ezNSSHGAOdzxUPQ17eY9xtS33wicYTf0p6ylRxyntgnf9Vk8kqn22FYMimaFhIVkxIzrnCyCRG3zF5vLgaHxP4g36GqUpPlfNqYSx62Yh8X7lI+GVYxuh6N8/Z5k3W/hrsDYZ+h/pP4nho2m73PM5OwqYmZjYMFAQnsuY5UHMlQcNACY6SttvWfybvSLM7KCsKfV03BnexElOsZHQme4hW8oj3owkPfjQ2aVsya59la4ANIIYRA== 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=dEJh2v3fu9xiTeuYKC1kT+nebYd9Jlrh9GHewRD6NdQ=; b=iJ0XYICETSTAyXmcT/n8a6Lge71UukjBp09dlZNd7lxXtS4SdnOLy1s0OBBZRRTFpovewt6OsUKbOJ4Vd94iR8tlCPfoKo+N2mIyZvX3ttab0JGWuXCoU22xTQuXULfyfWAPhvdlXsYFSPOGw2HwwRk9i/XWxMTP3Rv+tQiv/919YssLOEmLYrYByxtW8XnlWFjAYyKvzGT5Z1iIivWki2pgzDnRkTK7TOfnJklhkXxElyANoW7XnAUYtg3wmc+PkXhb2/Q6G349X3dIkPa3+B3IQcMInzI4dGwBWU+XyqRAP4qEirDd90JstPVPPCu3Ah9R4WdH59BzJvF/SgzgPg== 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 BN0PR10MB5125.namprd10.prod.outlook.com (2603:10b6:408:12e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Wed, 7 Dec 2022 19:52:41 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::ee70:1952:4416:1bdc]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::ee70:1952:4416:1bdc%5]) with mapi id 15.20.5880.014; Wed, 7 Dec 2022 19:52:41 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 5/6] libsframe: rename API sframe_fde_func_info to sframe_fde_create_func_info Date: Wed, 7 Dec 2022 11:52:21 -0800 Message-Id: <20221207195222.1182788-6-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221207195222.1182788-1-indu.bhagat@oracle.com> References: <20221207195222.1182788-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MWH0EPF00056D13.namprd21.prod.outlook.com (2603:10b6:30f:fff2:0:1:0:16) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|BN0PR10MB5125:EE_ X-MS-Office365-Filtering-Correlation-Id: 9892e6df-7538-4b64-bbf6-08dad88c9975 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C95I+ccfTbXVywYK7eLsECk7Cuu2/55kXlfTFWrZ0DunGSoAdpGWy5TExhZx7HugThRZqmyjMXtvqRIXEdwV74+zT/jAxOXh58CwdiYFou0Lnsk/G7SfplEmVPohmlvVpwcWme01lKLblMFadBSvz+YYdKaZBQCm5WodhszUCRIuVXixV+XK7P8oghludNxKmwrHYlg2ekOZvWZyhGkrZEKPpjI/zXYBQypO+v7B1R/UA7CuB+RXWb+wXz74Amx9QdD/LKbvjQdmleA4Fc0o2zW4NncGiyeJhJmw9WyR0PM9jw1cbRsjC7UVDgmc3wmnEufMRpyhbsf5o+ZjwaQbs09iSQ8ZQkexbDJx00Na+KED8iHfebqH8lrIZN2Gn6FmecCkdKoT/8xvIyetUJZPKKvTzElzlwqVFBq6tGxWaZK3+C3WlVbf8au+YSsEtqV+JYPOoRRDM1GSqnDa6KKpNYUz0JSrhctJGm20QfQBwcYmfv4YH7yCve8Gjg733yAOdhUDyvusQMxam/R4JRJvRQqYTDbkJesID0ROzfYkZcDOPyopxlapTJVp1qU/W6Yfy9BBjKtBZ+8zmNa+VM3ZrENTGas/zFIpIjwyk0cd4z66hjd13kXcOxuSYqVXeDtzApJ1vuuhrcNEPYz95zCtJw== 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:(13230022)(376002)(396003)(136003)(366004)(39860400002)(346002)(451199015)(83380400001)(38100700002)(8936002)(4326008)(66946007)(66476007)(6916009)(86362001)(41300700001)(44832011)(2906002)(66556008)(8676002)(478600001)(6666004)(5660300002)(6506007)(186003)(6512007)(107886003)(316002)(2616005)(6486002)(1076003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1CD0GbtB9+2e10Ps09Pc7Nt9g4wkH3C4RaSVVtev+BKQUSr2Rz1fPvnpGgwtPua7XKV7fD7fZQZhj0rYKAjOQM5kboak26aTFPmt7QcuJDgX43HeGtlbtUWEQSCyqKGQ2aGKiZjn8G7L6P1+bmW7gU0Xhrr3B2cYws6B7g4E150KFRQutQxyep8yHUro32GkjUUlqfnp9iznnxe0YMii1X7WvI76igVTsTsWuz6mEJx3h8EBYKGCjTMQN0dlZICBOiuvrLS9L7lRS/1O4SrKStO5da+J8MjqwJAxT+EV7pPVHs0ZZd0zM0uT/qzodxz02x+5Go9OWP129JyaSqM4xIKexKihIWyl7SzYtGi0ZAXZvx72HPndrv8FI9UbwcVWyam4yg5rzet7G876VA3Jzewjt9kdvFxoT7rzTFlai10muCFq1X6MbK3ATDtmuGH8HB8ybozlxKGEWXTDD2iUYc1RegrohuID5r/H/DIDVkVahyfG4fb4p919rAEoxLz5qyTGG/kbBvpfdiW/sbD3XoJtvuKxLxLBMK6VXnMzZHPe5vgsNrjBdSBdtHPctEJziVE9ATWuKexC82ytf3gC1Mfo/OYACbjkTVR9RP6cYHdVxuqxyjUtUPNUb5+aLMoSRQX2s6ohhyLih1O14Ows3OKdGv1EC/wePi/0GvRADXI8iJDRIvPwaAsPavEAZ3gMc+CPNuDaPtiXNDFh8rtCxconGqTVbgh9vKOsoDz8/ZVJkbbwylHGGillGM0AsmvVqrf2378ybTakjKCLjwVHreTuF2SVzs62AUNCnB4nDa4BYAY/2bxHKyyv6gl6izutLS3AU2CsHnTN/sweOHNXqUY3gfOZP/+jpKWmvjJZUFTabz7E95s9Ok/aMJ4P+r8WaCAoI5vTVh5QkgUGbbRLZLl8OnRAgJOmJItduMmCeEBvC8loXrBjl8eaH5B52TZuCYCWcG3TV5iU+lTaVzw5LmkviTXO6OcXZqPVMFkpRgptN9x3DlmHZNuDuvioa958SixLI/tjn1j7vf0UP6BLWdbQbGpD0SdDROaWhfNsLHw9TtK7j0TFsQ2XewNTG1qH0NiSAoqKXYclVqeYwZwQlzX1ibEvsz+TLGw/a6uZ68ibq9/Cxzd2ndamH7jgQtnQ1MaGovVMvNRy+8rDedD7Fz8j8hLipNGui5wkVuiXgp3rW2jtmMD1/qnxmXD2zFucC4KEQrXg6p/LIYL7CQhfMAN4rDsTONw5rF/aEZXZMMcFp5KqkX3PzhrzNUgI67TaE2e2Ie+VSlOH9mqT99/dl5ULnR6F/vADO9ilYAOmGXSenpV/BQI1rOPGLROSYHLq8t1/u/ho2CUbvId0FB8fNZeUVM7UVNh2/687iQEwFFTTqKUb86R01tPQ1Lk8+sQJh/hzfGBVeChF0waQDcKJx4Nvm1sZXG25/mZvhEqC9rYcC0peNZSnGKKZKKAJQls33iFGJsVPQzbekQwCyeFmemckXieF0m07u7WgM2gNRBM6PsK0lshMDFsIFYn3JcrVQ3deS4SpfocTfmNcggtwSzywZhjGa2kuJeM1xY4wSBseqgTYlZRKY4bpDKCKgGeTtDrGbIDj18LGw9VRS1JkAfG7eORVPLItbTBOvbPaEpY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9892e6df-7538-4b64-bbf6-08dad88c9975 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 19:52:40.9403 (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: rCmDkRLdkuGT3OesqDgOzreb/pOhXvwnDIoqMMyipTe74C9ffEuuCjfHdDp6rQcg1UPi4/T4OT5jEkLZLT2yJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-07_09,2022-12-07_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-GUID: fzacxkPV5LC_dBh8rEdBPVrj4JPT1SgQ X-Proofpoint-ORIG-GUID: fzacxkPV5LC_dBh8rEdBPVrj4JPT1SgQ X-Spam-Status: No, score=-13.1 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_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 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?1751586376489022110?= X-GMAIL-MSGID: =?utf-8?q?1751586376489022110?= The new name better reflects the purpose of the function. ChangeLog: * bfd/elfxx-x86.c (_bfd_x86_elf_create_sframe_plt): Use new name. * libsframe/sframe.c (sframe_fde_create_func_info): Rename sframe_fde_func_info to this. * libsframe/testsuite/libsframe.encode/encode-1.c: Use new name. include/ChangeLog: * sframe-api.h (sframe_fde_create_func_info): Rename sframe_fde_func_info to this. --- bfd/elfxx-x86.c | 6 +++--- include/sframe-api.h | 4 ++-- libsframe/sframe.c | 6 +++--- libsframe/testsuite/libsframe.encode/encode-1.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index bbf868826e5..88c34d397a8 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -1857,8 +1857,7 @@ _bfd_x86_elf_create_sframe_plt (bfd *output_bfd, /* FRE type is dependent on the size of the function. */ fre_type = sframe_calc_fre_type (dpltsec->size); - func_info = sframe_fde_func_info (fre_type, - SFRAME_FDE_TYPE_PCINC); + func_info = sframe_fde_create_func_info (fre_type, SFRAME_FDE_TYPE_PCINC); /* Add SFrame FDE and the associated FREs for plt0 if plt0 has been generated. */ @@ -1888,7 +1887,8 @@ _bfd_x86_elf_create_sframe_plt (bfd *output_bfd, pattern of the instructions in these entries. Using this SFrame FDE type helps in keeping the unwind information for pltn entries compact. */ - func_info = sframe_fde_func_info (fre_type, SFRAME_FDE_TYPE_PCMASK); + func_info = sframe_fde_create_func_info (fre_type, + SFRAME_FDE_TYPE_PCMASK); /* Add the SFrame FDE for all PCs starting at the first pltn entry (hence, function start address = plt0_entry_size. As usual, this will be updated later at _bfd_elf_merge_section_sframe, by when the diff --git a/include/sframe-api.h b/include/sframe-api.h index c658474253f..0a86389857c 100644 --- a/include/sframe-api.h +++ b/include/sframe-api.h @@ -83,10 +83,10 @@ _SFRAME_ERRORS extern const char * sframe_errmsg (int error); -/* Get FDE function info given a FRE_TYPE. */ +/* Create an FDE function info bye given an FRE_TYPE and an FDE_TYPE. */ extern unsigned char -sframe_fde_func_info (unsigned int fre_type, unsigned int fde_type); +sframe_fde_create_func_info (unsigned int fre_type, unsigned int fde_type); /* Gather the FRE type given the function size. */ diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 64fa9078d62..d4eaaee2297 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -548,12 +548,12 @@ sframe_decoder_free (sframe_decoder_ctx **decoder) } } -/* Create a FDE function info byte given an FRE_TYPE and an FDE_TYPE. */ +/* Create an FDE function info byte given an FRE_TYPE and an FDE_TYPE. */ /* FIXME API for linker. Revisit if its better placed somewhere else? */ unsigned char -sframe_fde_func_info (unsigned int fre_type, - unsigned int fde_type) +sframe_fde_create_func_info (unsigned int fre_type, + unsigned int fde_type) { unsigned char func_info; sframe_assert (fre_type == SFRAME_FRE_TYPE_ADDR1 diff --git a/libsframe/testsuite/libsframe.encode/encode-1.c b/libsframe/testsuite/libsframe.encode/encode-1.c index 4075591ffa1..01481106a62 100644 --- a/libsframe/testsuite/libsframe.encode/encode-1.c +++ b/libsframe/testsuite/libsframe.encode/encode-1.c @@ -39,8 +39,8 @@ add_fde1 (sframe_encoder_ctx *encode, int idx) {0x1a, 0x5, {0x8, 0xf0, 0}} }; - unsigned char finfo = sframe_fde_func_info (SFRAME_FRE_TYPE_ADDR1, - SFRAME_FDE_TYPE_PCINC); + unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, + SFRAME_FDE_TYPE_PCINC); err = sframe_encoder_add_funcdesc (encode, 0xfffff03e, 0x1b, finfo, 4); if (err == -1) return err; @@ -64,8 +64,8 @@ add_fde2 (sframe_encoder_ctx *encode, int idx) {0xf, 0x5, {0x8, 0xf0, 0}} }; - unsigned char finfo = sframe_fde_func_info (SFRAME_FRE_TYPE_ADDR1, - SFRAME_FDE_TYPE_PCINC); + unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, + SFRAME_FDE_TYPE_PCINC); err = sframe_encoder_add_funcdesc (encode, 0xfffff059, 0x10, finfo, 4); if (err == -1) return err;