From patchwork Wed Dec 7 19:52:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp376011wrr; Wed, 7 Dec 2022 11:52:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf57tGMHSBTlaitV2pcUm/ZsJmSBkhurXEkrPVzz5tMs6Ggj3dYx9ymjbsaad8g6H4hjmgUf X-Received: by 2002:aa7:d8c6:0:b0:46d:5e5e:5a03 with SMTP id k6-20020aa7d8c6000000b0046d5e5e5a03mr3525170eds.146.1670442766380; Wed, 07 Dec 2022 11:52:46 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hg5-20020a1709072cc500b0079d5da30399si10912751ejc.427.2022.12.07.11.52.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:52:46 -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=ok0M3kHw; 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 A842D388FB51 for ; Wed, 7 Dec 2022 19:52:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A842D388FB51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442763; bh=fcRoX/8huw4SToK2RpQ3gmMw12ow7QHbIqacJEuNSkw=; 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=ok0M3kHwSQUqBqmUvhnR6+x7zq3IShVlq4bKRG29zaWWyLxaLtMh+uzum7O/Ymz2c Kolne8+wEQMmIy0QNcAt/PEe6f46oTSUcYJytVl8IFcbIXJPWVb2+FKOoxF+wmpukH eZKRepZGyl1Jrn8Dn5QqT5Qf9gNV86GBp1OjE+gc= 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 1298238367A5 for ; Wed, 7 Dec 2022 19:52:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1298238367A5 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B7GAtIk010160 for ; Wed, 7 Dec 2022 19:52:33 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3maujkh6e3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:33 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B7J2L9w021720 for ; Wed, 7 Dec 2022 19:52:32 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3maa8gbfg9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=anykktnYSMYQjpkBYsIevP9MJMX9+lvtSjhcbCtE9sedal/Ko0TQbTRJj54SxTqRMnQ3ULR2A7MRY8m1P/t+cdZF8CKupSi+I+sXzGnn3fGoOsMv8YxL/PtngIeLx2YXBHtpfMJPsB9+bQVHD63SqeO18XOk5fANFVI0s05nQH6UpBXuABUuJeaMhy34lOA/Ka6mw7S1QA3fzW4EQ4PjuxTMKVbU+LPo5iwvfyYAb10QP/HiIQlDMvf0A0UerDkLCTm0IQgvroJlljcmx6NhtwCXoxls0JK8baEHtE5xYUd31tAOlyXZrqcpYzc4C33mPHgwTGKbFWdIVQAMuw8mKQ== 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=fcRoX/8huw4SToK2RpQ3gmMw12ow7QHbIqacJEuNSkw=; b=ja5BhTd+QXwUXe+dyG9HtWSuxoDDIj5sfD6lrSeodIZ7fqS09ELgp5K4iT9Db72ioc4Nq0IPIp/bJE4N2Njh8Mw5wLRZogy9LyqkbOHSWKmUPIgK7LJD8A1GPlX6xWv2qFmzRC4uigd7aLe2iOVGrmiUB85dk3m47Gqef6OvqEgRZsMUckL3c/mo15APYR+WbbQvr9gEjV0DD3nGp1G4dMupyKHTPTWIZWoCJradAWPfEv/bmOYThwiTwyby/WPY59PFIZhHTDne5+2MwA8wX/qacaLL3Ni6vFBe5TVgk9fKYT17WkPgOy7ZbA80Ff/Sp4v6HuAdtvD8r6DS9qVfXg== 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:30 +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:30 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 1/6] libsframe: minor formatting nits Date: Wed, 7 Dec 2022 11:52:17 -0800 Message-Id: <20221207195222.1182788-2-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: MW4P222CA0001.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::6) 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: 06a4a89f-3215-4b72-af3c-08dad88c9314 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7tOGvyuXC+i5M+NISFSIZQlh6NDbjI5ikTRyGzg180yKzA7frhol12HdSiACqOEFBg1a9QyW25QOLaRHujbKCKGFzEMAGgw/PWLV660Is6CXHPpcOLIMdyiJhMGy3L0nhKKCUNk5A9W+4GIrp1mxpQAIxt+wnmiOgxeZ2elia6UaujyQVIz68h0pd6ma/48JFjI7qpXdw2A4K46otv3tJ3q0wFb771/kAyEzXttMHnfAOc/gw6AHpso3PSNnqYNYQz1NLAemnMX5CD/UuQUhDaJFy6uVno3vuyAbl6n1wBvRFOdsH+WqGEEctBCdj9AzWyBT8bTRKvdcuN0Q6LVGlTHEL8RyuNSOE2MuSySXpSzogZKVqaEYOJsUIGOpe8CdgLeyxULzKEH2ERe/Gh4Hg9WhMUFctmVhzsYRxo2iHmAnCGHKt9NJV4pebuCbTZC/GznJ5ZrcoNnIqM1Azk9Eha89tiCXBMclFpTt1bv8Pqyi0rJ2Yr9AeSETP5OzF4/JpXBwUsIcWHE2dSAHhi9JOZ8t481RXlAAHLwW5cTGoIcpoMmZTb6TIEySkdjMznNz6X1EPjFxwfxOgZES8Vmhe7t4VcwYeRg828Ip+5DktXqu5vWk2RCInFzFKIiCp8kW 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: fAnkzFeGbly6ugzz2+Bvi3wk96H6mHyy1+jg3ZXb5yZHokcQHrsCMO15AGLPtvciSXdYNHu2Oyuu0hFGjPXIKGZGD99ru+Q/5WE8FuZVMaSWmpiBpitqOUAJlNLVqMWBHb52PCfUKzerwUvHcmajQvIkggesnNv+L8SCDQ5Ce9aSWY5ftq+afaCGCKi4ZFC6ovqQGAAnJh3qLm9nUp0TxiBiF5IFoRgGEDS17fQXpakQ+GXRGYMtj9Nrb9fPyawGokh9dr4OIk3r2DCVAQzjB3GgnGPz6lUfBqlQYsm3YTjiT0sZWGEjxl+r8OgzprkDj7uNbkSXueX4lB9kNKZ59uNntxFPuj39hxOEk3yVfMtyDQVSwC3IdY1R/n6iDSWI7ByxHbwEIRE+xGYVVXx/g1gVT6Jv980YxotCWwICb66wfQgBRGK6p1Z6Ve6myENm/u/Yn73h6JKyB1b6NfBKGXs3c9zYZt/M91Z2ChEYsagNlKcxFQ1ebP1IkGAlqohFqYoBkamQ0y4BeJ07Yc4sN6KRkhN9Wfy4rfDxxQUE3D3vMIQVDFGSnA/MroDCMxZ0FkKAv9csX28fwR3byQf5/k7eWyRBToNKUylH3m9LLBjvMsH/oa9KLT2xtNc99O9NkAwEhD3PGx6cViDJGVF2KaJOAqoeiIu/1Rk2ffSCTf6J+nPJyjrfnaJX5XurEoI+gZ2mOvna7VEM4WNCBAC3GA9DYed+1nNXb2obPbQhVqv5KvSzmQuyrDhU4leQKQYbKdhJsEF4V7gDFaUO4fQ94/PmRbyK4UYuxnVNZA3Rm8G89AqIrocAvsKJcl4cg9EJJr/ZfDRSn3pkNgSYyhdepbrYsXH4AICAK3ed4sAJb2TaU8JJqTPdMfr7lFgP2chMHmKFwYnQnwJlRDW1Ey+IPHWBi5cmeN3GwvhkTGe1smPtRRbCueSGfW56RdTiLM17Au1TiQsHDGg//5sXrveDN3vedohGIsdRn6otZwMl6w0/sXBO2MJJshkCzwPjw4HP3LrAAZ9cLGZlATE2VjEvo/tGyDOvOeAwu+nejUvMsxxGrsnmxw3aU/qDujYdEN4F4GsnoPgtX0tFCXe7inM/CSC30yOKp+4U4jkU217cU2y5VB0zZbtuPBj7Nniigmyc59ZTVhnjughaS8O4UKLdZRDbn5DDcJ6GMUtI6pA/6biWCueqb642JBJOUkkzwM7svtDN1Ix7ydtsVAvZjy0k6P68EAsv/wVvtTr+bHFdcAXiE0xiS/13iqU4evSaYRdEmJ+ekEL1ke4Ag4wPykUiEHiOB1hi53ZxchJgaZZxeCVcIXM4QQUgoZFSd+zastBltvPGvKtYkoju6uU5+l1qBu4XXtZgojhtY+TXtnWRXCsbBaQ0mQ4GPTBTGn5GWIjv7AHmFQP+2KaPLdcu8QwP7Oj+7qv5hYXfEeo2dYzMKlhIZYOKjKX0GI1T84IVD/DpksUBxx1vJPxoyjlLjnYzK3Qcg6PFPGvSkmBVZberCJLtoch7SEzfl1K7Zyv3DlIMQ4/CQ2RrDt57/JD5kKLB1TuBhle8ZZODkKj2P6oJjUV6enG5EfA0KI4t3XuqCxDqxkfoVNoDL5ggyG/CAVJaMnNW7iv6TVZM/H1z6T08Dkg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a4a89f-3215-4b72-af3c-08dad88c9314 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:30.4098 (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: CXo1Tk1TzCNI1LlOooec1pnM5CwGLT7+enMYyqwbGF96Gvo+wHE08zJLXlHNFBgy210X1goUF3rn9ZH4zVNdeA== 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 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-ORIG-GUID: 3Csf3t-h-dHY0q2tP86thCM0xLYqenTM X-Proofpoint-GUID: 3Csf3t-h-dHY0q2tP86thCM0xLYqenTM 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?1751586194419731751?= X-GMAIL-MSGID: =?utf-8?q?1751586194419731751?= ChangeLog: * libsframe/sframe.c: Fix formatting nits. --- libsframe/sframe.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/libsframe/sframe.c b/libsframe/sframe.c index fce821e4414..6e0eb7b6511 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -202,8 +202,7 @@ sframe_header_sanity_check_p (sframe_header *hp) /* Check preamble is valid. */ if ((hp->sfh_preamble.sfp_magic != SFRAME_MAGIC) || (hp->sfh_preamble.sfp_version != SFRAME_VERSION) - || ((hp->sfh_preamble.sfp_flags | all_flags) - != all_flags)) + || ((hp->sfh_preamble.sfp_flags | all_flags) != all_flags)) return 0; /* Check offsets are valid. */ @@ -723,7 +722,7 @@ sframe_decode_fre (const char *fre_buf, sframe_frame_row_entry *fre, /* The FRE has been decoded. Use it to perform one last sanity check. */ fre_size = sframe_fre_entry_size (fre, fre_type); sframe_assert (fre_size == (addr_size + sizeof (fre->fre_info) - + stack_offsets_sz)); + + stack_offsets_sz)); *esz = fre_size; return 0; @@ -980,8 +979,7 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, sp = (unsigned char *) ctx->sfd_fres + fdep->sfde_func_start_fre_off; for (i = 0; i < fdep->sfde_func_num_fres; i++) { - err = sframe_decode_fre ((const char *)sp, &next_fre, - fre_type, &esz); + err = sframe_decode_fre ((const char *)sp, &next_fre, fre_type, &esz); start_address = next_fre.fre_start_addr; if (((fdep->sfde_func_start_address @@ -1074,7 +1072,7 @@ sframe_decoder_get_funcdesc (sframe_decoder_ctx *ctx, static sframe_func_desc_entry * sframe_decoder_get_funcdesc_at_index (sframe_decoder_ctx *ctx, - uint32_t func_idx) + uint32_t func_idx) { /* Invalid argument. No FDE will be found. */ if (func_idx >= sframe_decoder_get_num_fidx (ctx)) @@ -1091,9 +1089,9 @@ sframe_decoder_get_funcdesc_at_index (sframe_decoder_ctx *ctx, int sframe_decoder_get_fre (sframe_decoder_ctx *ctx, - unsigned int func_idx, - unsigned int fre_idx, - sframe_frame_row_entry *fre) + unsigned int func_idx, + unsigned int fre_idx, + sframe_frame_row_entry *fre) { sframe_func_desc_entry *fdep; sframe_frame_row_entry ifre; @@ -1157,7 +1155,7 @@ sframe_encoder_get_header (sframe_encoder_ctx *encoder) static sframe_func_desc_entry * sframe_encoder_get_funcdesc_at_index (sframe_encoder_ctx *encoder, - uint32_t func_idx) + uint32_t func_idx) { sframe_func_desc_entry *fde = NULL; if (func_idx < sframe_encoder_get_num_fidx (encoder)) @@ -1273,8 +1271,8 @@ sframe_encoder_get_num_fidx (sframe_encoder_ctx *encoder) int sframe_encoder_add_fre (sframe_encoder_ctx *encoder, - unsigned int func_idx, - sframe_frame_row_entry *frep) + unsigned int func_idx, + sframe_frame_row_entry *frep) { sframe_header *ehp; sframe_func_desc_entry *fdep; @@ -1371,10 +1369,10 @@ bad: int sframe_encoder_add_funcdesc (sframe_encoder_ctx *encoder, - int32_t start_addr, - uint32_t func_size, - unsigned char func_info, - uint32_t num_fres __attribute__ ((unused))) + int32_t start_addr, + uint32_t func_size, + unsigned char func_info, + uint32_t num_fres __attribute__ ((unused))) { sframe_header *ehp; sf_funidx_tbl *fd_info; From patchwork Wed Dec 7 19:52:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31011 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp376067wrr; Wed, 7 Dec 2022 11:52:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf4jrGX03qiPY1wuHsn84Yva9Mh4x4QRZPd+5zULg9PfSfE39ZB2EeXI6E4y0RvqNFECxg9L X-Received: by 2002:a05:6402:22ee:b0:46c:d916:66bb with SMTP id dn14-20020a05640222ee00b0046cd91666bbmr10913401edb.34.1670442775698; Wed, 07 Dec 2022 11:52:55 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qk32-20020a1709077fa000b007877b1c7f27si17537619ejc.829.2022.12.07.11.52.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:52:55 -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=Mwvgb8jJ; 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 603D839217B3 for ; Wed, 7 Dec 2022 19:52:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 603D839217B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442768; bh=8Uti5E/bgmmnwV1U6eTSOCoD0qer31ot4ejRueFCgbo=; 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=Mwvgb8jJL3kTL6lexxqLW949HZ/dXMwSDI3qepMYf9553rnAa39FfZvrlNO8SEpd1 PVjbw3J54XfYGzk3y+qQ3v024T/E6qkplouQkCL5yCb43GRSA5xZwwDFjNy1g7vGfs iq+A0o8voJPkah0bSc+jtP/naRnGe1j5Yx8sPoz0= 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 452473833A06 for ; Wed, 7 Dec 2022 19:52:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 452473833A06 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B7GDuxJ010247 for ; Wed, 7 Dec 2022 19:52:35 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3maudus7mx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:35 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B7Iw3Mx016117 for ; Wed, 7 Dec 2022 19:52:35 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3maa4qmc2d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WfkDbyYx0101hOL7Edst1vaPhVjzbkQzNRqq3werhZ5X1Aori8UKRl7sp+D97Zl2tLDUgb9LblfBshMG2gM1RWZIk6+XE8WCaPiq7yVmWH+xbL76eayatQDWeJyuANz+3cuPkDwjwl1ypLSqPUQoGQ6nyOBs40wCSibRTZUubVhSWgnB17Sjh7xot5Xgh/ktwj2YgmUkgrFT8nPqy1rZeYmsKlW7oAs6bftH3hGb/7cYk5s8ZKl0RuEtvrZ8GunygywjtkcaRn8uNDe1+DBWMOzeXrZlDas+0lhKe9kXTF0ZM8CMVutc3ZTGm0a4FpiAC8HscF5GO8Yb3pM47LpBBQ== 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=8Uti5E/bgmmnwV1U6eTSOCoD0qer31ot4ejRueFCgbo=; b=aSpZl2vu98mYffSvRumpLQ2E+4pnS9IpC+cRgeVNYMEWn00cbf7w5Va86uFBgpgWH6bJANOgjiUhfHdlGCGDbD5JNHH8LF0SqAUSrUJSALelyBeZ50G/a2xndxXM8shLCDrcDecqvBQJlNl+R2enKBqudqgjFkVahoONgwdpTPFSBgeTj6FRgF+svfgx2FfUjYT5qjPsqBohYNuGAn9Jivwmp5kIr3S66Xi3qLHqoUq0g6TN93Cx+DfGNIaNbBHi2UckHGoWSY6wS48r0m6oWzaxPhXa4dqN7feJKvrGdQheyxx+oqHz4bc0UygRtzwWTNg5xK18QA5oCzqr+6Nx0A== 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:33 +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:33 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 2/6] sframe.h: make some macros more precise Date: Wed, 7 Dec 2022 11:52:18 -0800 Message-Id: <20221207195222.1182788-3-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: MW4PR04CA0324.namprd04.prod.outlook.com (2603:10b6:303:82::29) 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: cac56ee0-5b14-4111-ba24-08dad88c94cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HeU7TGqmg3jgFnN8so0aksxuAvyiQ2UihlvWNgOuf+ONgNDEBWNr2o4EEECwlpDWoc9vJvlbngPyXad5zSQ7J+mGe9c/bCTIhvDdFtvrS94I03FwHFmJtLpxpHdfJVAyQuZzpjT1mTPRBOX3YunAKigBUG79Glah+M26zQWQGQ3LsNIvjE1c6X4ioZB9hqT4RSTqLiCgymY/rCSsEznWYVpXekG6kWucJKYtkc1/DlC5i4CBpAh1FL4/24ncSX66h168WsKDHVap2SnaVTASUR3LExmsv+/kAm6uD4aGYbr9RNdyvkzfAVIL0UDUBOGzBADG/AUMoDKHxPWXmkqHC82998v0W3sJx0mog5flv0TKojCcEP/i55QhuAoTld6IPcqww5DuilQdZiRG9Ll5XHBd0Kj1FjGAycd+ig27QJPpp0rJyGoGPG+Jd8Uv+GKz4qkWs31vZxWIRO/r1gGHDZa32WRCoRS4iEJPWPGD8lJ2PV/1L/NJ+ygz20rwBXFoql4028SSnbjnofeDjO/2PQ3h54GMY247WnNlbanA/+uueZYgfg0vfiQhc/W7y7o/hodIqZ/clPGQEAxS8fIma1Qc6JUbChD4XaDE0Ii0lPR5ejrpN2Fv+Ll7u+N1lPX+lEozKUmId31pr+PbGMCJhg== 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: geZCo3Xh82qXs52ELWwAhlbn9P2XArDcmYgATyU+aTZGhbpH1luOJONKXseAMZdDZTIgKKLd3f4wmleJxXyAp4cAqdAzqr0zTJpcEqmPdlaK7Mr0sJpQRvRLXAEdXcsB3Q4VS+JSPTtrTks1bdZHP1BzYDIGoN1N8dM6tyJpJUfWczvoL/+uuPVx9rglsBSmiD7qFPn3fZZT41yVQk/bcQjM65Fj7IHO1CWlCS0yPSFJndi3cIgZ+kWC00oi1kzNELHZGNAvUZJUprXmHq6+LLHbozFHh0I65lumr9W7XgHhk9aMrnwqx8rbua4s0VDnL4vo8HZUY/r3wYIa5Aj/JaNTzssJ7rczfoJtpLejBYJGGQL69IM4VlShWp8O5d0+QgBJ7nyGXeYWAUvXTz1a1tFnXNSp0U5MQCKwbMUUo82thIKpdmABjzoEa1fTnqUFyvGwzqa8yIBISPctQ5wqTRFcuwN9Aw+xq2ltSui3Pttc8LfjT2CCKggvZwxpiJNPf06INfV+ZzLfw9GcpXuc103Ca+PTSsDZDTgliyNdyPb8+85X3eQFmbNcPEEGf5icOrp+ifsPcFG2bQvy0TKCKGw3Sj03LYw2j/OF+hMw9sLCpCo2SWkXBs710LweI25Oj9S1DU4UxlBBT8ocftekY8qhMbCgxo6tz7v8qhW2NlhzB/OrSc1C55Y9nDjXZsP1BUvGiz6+r4rjvSoDt/0BYvUc1/4zjYqSk5Vb7m2L516GEGRIkpD26h4SAERl14CDaXC3WZaU4LCa4+9HtrS+Ela2O/kgTVJOsD6cGfJclkhthgY9h1iwLpf9ovsk0v0kpfTMNSPMmXYrRpK6ztjCcKy05GCGAWEOJHj/1NvCSd3vGUX7Z0Emu9MtGZ5Oi9Wt1tD9dtc/mN4PyAhplnB521K5cGvpbKBCHqsWs+Va7mWCpli9ZcCsIRoXEUQdGN5GEeRN4Hp5R3dFUb+l/rXglkXTs3WwGHHWGxIty7+EsujHDUtCzXVPOEuPYK5Usr084tHSruuBPg1nxZtb8jdA2PsZhdKEDOVRRy9fEIhRrt5OPpAtMSGQ+f4qsPohuokjoWId7V5YpJlYfyxfsxZ+GoJtGiDHhce+6DgpKYeJmQH9NIxhS1lor+KHH4/gPXTk25XHR064/S9vgEb2evUpfOhtUEi9uACb59e3cTOu9wjf5vC+8PtwwZCWQCWHLqE7QesaiEzyqAnvz5SPWEwDsFO3IBNv9Aa+OOEl00l7roq1skmvc5KwulONSjHciQn0Zc4lyfvgM0BYFR3u8O3amnBVEG56tB2wQCGB1kPV95l+UJGX0NCTW4rRHcRoZBlWteAoTVAxHYxSxJ+owyrUDFgZYfGUzCFbiUstGIVSS/SQv+S193m1aOSMaO0EzXbjHPNihJ0bwiUG8iHSAW+hrf4JfBMgK9n1XnrK5IdCIPqOaV9f5655voy874V7OLvvYAdfdHzg36bd+4aM6KOIVwaZFZ4uQSB1eDlrclhhlHA4WJDn1FP/A+FhA02MDFtvmmZRPiE2L0AGcYZvf+7RZXSrBoC/GUcZGm2c7SNThAvMY+zofSp0mU1pIPQZ54381gXtLqbC0CBQM6AQCgpZQ+VtMsftNwJnXhn+/4r83ms= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cac56ee0-5b14-4111-ba24-08dad88c94cd 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:33.0815 (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: lXThj/zsTBWH7ra6LGmiOXQw2vL2Scw+Q2BsSslguiE6Ew/pKMKxsPrmKiptsFwV6u8rZwnXel0JKo07nnwUrw== 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=817 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-ORIG-GUID: 72o6niMaq7LpW884AJ2WACVcT4vMvo1i X-Proofpoint-GUID: 72o6niMaq7LpW884AJ2WACVcT4vMvo1i X-Spam-Status: No, score=-3.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, UNWANTED_LANGUAGE_BODY 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?1751586204027909830?= X-GMAIL-MSGID: =?utf-8?q?1751586204027909830?= include/ChangeLog: * sframe.h (SFRAME_V1_FUNC_INFO): Use specific bits only. (SFRAME_V1_FRE_INFO): Likewise. --- include/sframe.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sframe.h b/include/sframe.h index 7e31284e4d8..ba557b7bf7a 100644 --- a/include/sframe.h +++ b/include/sframe.h @@ -192,7 +192,7 @@ typedef struct sframe_func_desc_entry /* Macros to compose and decompose function info in FDE. */ #define SFRAME_V1_FUNC_INFO(fde_type, fre_enc_type) \ - (((fde_type) & 0x1) << 4 | (fre_enc_type)) + (((fde_type) & 0x1) << 4 | (fre_enc_type & 0xf)) #define SFRAME_V1_FUNC_FRE_TYPE(data) ((data) & 0xf) #define SFRAME_V1_FUNC_FDE_TYPE(data) ((data >> 4) & 0x1) @@ -240,7 +240,7 @@ typedef struct sframe_fre_info /* Macros to compose and decompose FRE info. */ #define SFRAME_V1_FRE_INFO(base_reg_id, offset_num, offset_size) \ - ((offset_size << 5) | (offset_num << 1) | (base_reg_id)) + (((offset_size & 0x3) << 5) | ((offset_num & 0xf) << 1) | (base_reg_id & 0x1)) #define SFRAME_V1_FRE_CFA_BASE_REG_ID(data) ((data) & 0x1) #define SFRAME_V1_FRE_OFFSET_COUNT(data) (((data) >> 1) & 0xf) From patchwork Wed Dec 7 19:52:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp376812wrr; Wed, 7 Dec 2022 11:55:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf7iEJb0IaaqU7ztHlTgNfwq2JWlvyX8+crVUfNFgjiJE6/rKV2wVti9nZrWa6GgVliN2+4N X-Received: by 2002:a50:eb94:0:b0:46d:731c:2baf with SMTP id y20-20020a50eb94000000b0046d731c2bafmr2539557edr.280.1670442926817; Wed, 07 Dec 2022 11:55:26 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id q20-20020a056402041400b0046b0205ab58si4365833edv.580.2022.12.07.11.55.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:55:26 -0800 (PST) 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=VsnbeVBa; 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 B2695395BC66 for ; Wed, 7 Dec 2022 19:53:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B2695395BC66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442832; bh=L6s5/md7vipeZ0ldSSbjn+2v+Uui5S8EbxbrFgpzEu0=; 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=VsnbeVBa7OSweG4lnmdj9EEnCZFp/Z3UoN3BHCWf6BdJVfpVrl86a66PCHLKp2OSx S0+UfX3QdO1HXOarj9EZZcMHXVEKcFqXTYSMdxkKt882DzBFl5zI3MMBCnrhv3kTYK zEH3OiFtc5CzUBBteNWaoLFXPK0otwG1L4Dwa8Pw= 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 DA2ED38FC733 for ; Wed, 7 Dec 2022 19:52:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DA2ED38FC733 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B7GAsqU010146 for ; Wed, 7 Dec 2022 19:52:38 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3maujkh6e9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:38 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B7IwrUB033796 for ; Wed, 7 Dec 2022 19:52:37 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3maa7x4y4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFMOM11kAjGBPmPGf3RzvFHSTWAloXYqnfRaggd7iNhdsxytV3N59ly92hShJIgq8hYlp++n70j+BeQ6A1HAJbo5PNQEIEyLI6Fxz1nvgx3/T8cybHtu6IvvM29ijaoRlEsLwETeliUKSQldgkeh1zRZZzHPkUJzTg7FXEkXfYCkc4ArpANfYoez7c68L73V5dxa3nKNEVxP8gpjE1sYbsg5GLDv7ZJV3FwIqs/srppTGikeisg/6dm8G8NLvO5sIN87WsP0tr7fWBVzMiY7hp9U2Rswf+rXvSKhjrD7212MGcXnWWESuNsIVoQO3itKN88lLUc/d1xwZnkdSFqwJQ== 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=L6s5/md7vipeZ0ldSSbjn+2v+Uui5S8EbxbrFgpzEu0=; b=eBVC9UsP4j2UAhJUr3z17hAqOqnZ0Tw0Dk7PbnfZUA0b6E0L9FeOjYX9jB7pZovvziMHGP44Qw9Vr+o/LdTfg8vvwe9Zjfi5s9nuoaGST3WO6fPcz0ssQGMaVAb3MknAy9B7VpvveCuYgXszV0mEC+4+O5p+i12kJSp3f/XgQMV0mlH3tFQkXOslDkxk4s+zZqPQtc75zwGZVJv7LhharXOM0Cvbqv8pNT6B1hmKBs/wHZraxvDR+BY/sqxxS3WRE73aupslF2iKB8tdIO1h3XJYqHN7AQCFCjo8RFFByIfUwYZUVZTJbS/bvZnGAPuqd0VvUjBksmd7CnUQE4BmVw== 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:35 +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:35 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 3/6] sframe: gas: libsframe: define constants and remove magic numbers Date: Wed, 7 Dec 2022 11:52:19 -0800 Message-Id: <20221207195222.1182788-4-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: MW2PR2101CA0001.namprd21.prod.outlook.com (2603:10b6:302:1::14) 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: 1c75a280-464e-449e-8fb2-08dad88c962e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NIsZLoZkI6SHZJ/+5pXvW0MVTOAp+y6QTyGl9WqQFvecnkj3zzSYj/RUgCaXAaxLkkUSxzyht46hAcUS3+5VUZOzc+OTHP9F9WBQd/U+4Ql20kLCrceX/pG423QFUIsO6ChtO8/aNO3b6dh+YLGd0kn+jJLHtOY4Azq3XqF+4X59JbRaSHAz168pS5UecwjzXcm+hwNU6Y+QnPgDCQgtiOo2rso8RQ0ACCsf6YBmLmJFabu3V8ob43HB3/cjZV5cbDbzg3EGhnVc5JN9xQ22Rg9PZ9indxxi3imBU0RTfAfPs7KZ6aXLa+NxPAvX0U5UViW2tiFxGFgIlxwaQ4ObE0M4JaLNKV41aoJ7B92RSizAkac/KZn7j2kovKZmyKcI9h4pafTsdC2PAPiN9LrhcK3PLDinnGxgnjKGVG5/ivBbtHjE36tkx2/OLrp3gMOw+XgvmkgsPniRPY6Q3B4UDWqldpUWw9FT3WdG4c1N7Maf3dN2TtTs4o7wpLaHsGqswWVL8ieA/auFjw31pqZ0TwxNp6X0gllbIjinUg7QQ4dEY7AfMRSKTsB/yDmOC19zdHuG+D7O+N7SoFR7uw2Ap1R0U9ohF8LOO3VyeW//5ljuiHmWlgpMgepJwT2cEK5tuItzbw2zmtqnvO8cBeeGhA== 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: istoCqvYVhxJ7vtnpDnh4sLxjJ3tTKcxeT/fPNreG5ar5/gIjIHXDJMRRYt55p+PRnKiouqNWl6NsHk7MZFvugt5rGCAO9F2JDyxapXZ0Sx+zu2FQBOKWlclhCijfH9l0WUqGQkLg9hxYyMH5ROGupyzxFbfmiZF3cmC4h0zqBpZq61sLrwfRHNtaGNB2/K86ygpgGJNH6j2rCPNfB5sy8eFt0u/ULxgVRcpDz1X5ZLqsOOWReMnE68mhn2OOsHbqgWCxPLWvyR2x8WcY4xW4Vx0xtZ73ktuC/wIfaZNbOyHgRLPUxI19JtRM34uRc7OPaLIcYApKjh1KrOAR35ixPNjyd1KoS9QE41CCOG9H0cbVFdjQd1vbIl1GLHYouiz51DUk19LQ2q2a5DnNgoycFOdc/6KL7Bv/VXkmCyh0LQ+S+mlCrtr2gCnzmFUNjtLusItoFrlL6c8RqJv/G+wQV40KxdhIxgiJbfi6CMsoIVIBzO2z3UfU5D3NpoyXALRieuurFWoqXdlYSVp7GaYSHe0uNOOCcDCIglhtqYyXsD2b7HwHxmdtT1Dz9lfpRUuUif21z585U9axhtfxtd2LhAM/1nrKE2Z42Hxzix8CdCjuY7XXf6+ZjSDKf1K0LrdzI/XC7RsoEgPo5GQMQGYaF4jnBgJWhWQY9DL1nEDsMKSNUbbpiGselEImj92tfDhIFfO42tglZF8E9Xuk4OXoLtTmG7gMwTf/EixU7likxiVM6tJYJNL2+qSmsjtDOH6VL2htHguIHZnX7AfsXWQgTeLnxfwyBTPQ1uknnUMWmL9w3XgpiOVbg7DYgAO5fmYbhWYXBXUfBgsJkYPRY44kmjdzQdW+2Mx7b6plvu6qOTu2scx2SWPlx2AhZ7ZitruKZBBGcc3dHUDXLB1vMI8e0DwgtGdjFk4r3WYsRBUOK+HJmystLLlIRL9UejinM87R0bUr3o/LlicUGZoN9l1llEhMfPNOsWjW64OpurnD/nvmAi8JUMVGQ9XIMCuH7eDiOo55bNzC0Fu7G0NeBrSf/rKDrHhvmT8j9w107o/aZbTpw2c9CDd5YNv9+dbFmoXv8rfM9uxNKoKEur9o1mcwOhnU9EcO9CgajtQj9oZHweCWcl5lB6zrnCDVihvh1MYX6wJmsTfFbetietIvDPgkQZ1793mQZExuF0jUiS4HvWpt6ZPx+YsH3I0bUJIzYRGKHtvBQ1LAP53RxetA5ut/1JyMmoMesHhNqCvzeuyYHWmQuDTuDQYsLxUS+aPsS8ibASXlHaROliji959K0EJ6yy6ibQe89DKGINMLw7GbbTNkLu6v5SwRPMQD9NN7ZSbSPaiTFOZMHH2xfSptHlysVJHrke0pa1R5IvUQe849odzWxvTDJ7AyU41lNNsqXqtCI14T5uueTaTjx6KrSSa0BxwS1q0RfTHph5DxPq4B9Zh0zy1nx/A8lgP3zR7jfyxjVFcnLLDSeIvQt9MCkYJXYhzCx/tnOk3szdsAL60g5j2EwO2pRNg0nHSF9qA4u1Sk3Nkc6PLpnvEJo1S9ow/Eykmro4VW69kf+Ru2eOiSdabl1GnJtcJiQi1BGx8mXQJRZNxViYmHCFM2GS8CSwk2+Qz8Ib1QSDFsAgMGSiV9Nw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c75a280-464e-449e-8fb2-08dad88c962e 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:35.4251 (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: FLH+nK4UYLg4+amAgzJJDBags2DnyOFzoUEJcaq0WMsosiNd++Do2MIihSL3c12yIVH7zrvOStKQo6dznuP2OA== 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 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-ORIG-GUID: qQsLZs3BSelgjzWdw_m04k5EBhCoOTe5 X-Proofpoint-GUID: qQsLZs3BSelgjzWdw_m04k5EBhCoOTe5 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?1751586362679098755?= X-GMAIL-MSGID: =?utf-8?q?1751586362679098755?= Define constants in sframe.h for the various limits associated with the range of offsets that can be encoded in the start address of an SFrame FRE. E.g., sframe_frame_row_entry_addr1 is used when start address offset can be encoded as 1-byte unsigned value. Update the code in gas to use these defined constants as it checks for these limits, and remove the usage of magic numbers. ChangeLog: * gas/sframe-opt.c (sframe_estimate_size_before_relax): (sframe_convert_frag): Do not use magic numbers. * libsframe/sframe.c (sframe_calc_fre_type): Likewise. include/ChangeLog: * sframe.h (SFRAME_FRE_TYPE_ADDR1_LIMIT): New constant. (SFRAME_FRE_TYPE_ADDR2_LIMIT): Likewise. (SFRAME_FRE_TYPE_ADDR4_LIMIT): Likewise. --- gas/sframe-opt.c | 12 ++++++------ include/sframe.h | 15 +++++++++++++++ libsframe/sframe.c | 6 +++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gas/sframe-opt.c b/gas/sframe-opt.c index c17fd6b8332..6901aa82a77 100644 --- a/gas/sframe-opt.c +++ b/gas/sframe-opt.c @@ -53,9 +53,9 @@ sframe_estimate_size_before_relax (fragS *frag) widthS = exp->X_op_symbol; width = resolve_symbol_value (widthS); - if (width < 0x100) + if (width < SFRAME_FRE_TYPE_ADDR1_LIMIT) ret = 1; - else if (width < 0x10000) + else if (width < SFRAME_FRE_TYPE_ADDR2_LIMIT) ret = 2; else ret = 4; @@ -109,9 +109,9 @@ sframe_convert_frag (fragS *frag) { fsizeS = frag->fr_symbol; fsize = resolve_symbol_value (fsizeS); - if (fsize < 0x100) + if (fsize < SFRAME_FRE_TYPE_ADDR1_LIMIT) func_info = SFRAME_FRE_TYPE_ADDR1; - else if (fsize < 0x10000) + else if (fsize < SFRAME_FRE_TYPE_ADDR2_LIMIT) func_info = SFRAME_FRE_TYPE_ADDR2; else func_info = SFRAME_FRE_TYPE_ADDR4; @@ -133,11 +133,11 @@ sframe_convert_frag (fragS *frag) switch (frag->fr_subtype & 7) { case 1: - gas_assert (fsize < 0x100); + gas_assert (fsize < SFRAME_FRE_TYPE_ADDR1_LIMIT); frag->fr_literal[frag->fr_fix] = diff; break; case 2: - gas_assert (fsize < 0x10000); + gas_assert (fsize < SFRAME_FRE_TYPE_ADDR2_LIMIT); md_number_to_chars (frag->fr_literal + frag->fr_fix, diff, 2); break; case 4: diff --git a/include/sframe.h b/include/sframe.h index ba557b7bf7a..85d1e54520d 100644 --- a/include/sframe.h +++ b/include/sframe.h @@ -272,6 +272,7 @@ typedef struct sframe_fre_info fi */ +/* Used when SFRAME_FRE_TYPE_ADDR1 is specified as FRE type. */ typedef struct sframe_frame_row_entry_addr1 { /* Start address of the frame row entry. Encoded as an 1-byte unsigned @@ -280,6 +281,11 @@ typedef struct sframe_frame_row_entry_addr1 sframe_fre_info sfre_info; } ATTRIBUTE_PACKED sframe_frame_row_entry_addr1; +/* Upper limit of start address in sframe_frame_row_entry_addr1 + is 0x100 (not inclusive). */ +#define SFRAME_FRE_TYPE_ADDR1_LIMIT ((SFRAME_FRE_TYPE_ADDR1+1)*8) + +/* Used when SFRAME_FRE_TYPE_ADDR2 is specified as FRE type. */ typedef struct sframe_frame_row_entry_addr2 { /* Start address of the frame row entry. Encoded as an 2-byte unsigned @@ -288,6 +294,11 @@ typedef struct sframe_frame_row_entry_addr2 sframe_fre_info sfre_info; } ATTRIBUTE_PACKED sframe_frame_row_entry_addr2; +/* Upper limit of start address in sframe_frame_row_entry_addr2 + is 0x10000 (not inclusive). */ +#define SFRAME_FRE_TYPE_ADDR2_LIMIT ((SFRAME_FRE_TYPE_ADDR2*2)*8) + +/* Used when SFRAME_FRE_TYPE_ADDR4 is specified as FRE type. */ typedef struct sframe_frame_row_entry_addr4 { /* Start address of the frame row entry. Encoded as a 4-byte unsigned @@ -296,6 +307,10 @@ typedef struct sframe_frame_row_entry_addr4 sframe_fre_info sfre_info; } ATTRIBUTE_PACKED sframe_frame_row_entry_addr4; +/* Upper limit of start address in sframe_frame_row_entry_addr2 + is 0x100000000 (not inclusive). */ +#define SFRAME_FRE_TYPE_ADDR4_LIMIT ((SFRAME_FRE_TYPE_ADDR4*2)*8) + #ifdef __cplusplus } #endif diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 6e0eb7b6511..64fa9078d62 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -572,11 +572,11 @@ unsigned int sframe_calc_fre_type (unsigned int func_size) { unsigned int fre_type = 0; - if (func_size <= 0xff) + if (func_size < SFRAME_FRE_TYPE_ADDR1_LIMIT) fre_type = SFRAME_FRE_TYPE_ADDR1; - else if (func_size <= 0xffff) + else if (func_size < SFRAME_FRE_TYPE_ADDR2_LIMIT) fre_type = SFRAME_FRE_TYPE_ADDR2; - else if (func_size <= 0xffffffff) + else if (func_size < SFRAME_FRE_TYPE_ADDR4_LIMIT) fre_type = SFRAME_FRE_TYPE_ADDR4; return fre_type; } From patchwork Wed Dec 7 19:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp376211wrr; Wed, 7 Dec 2022 11:53:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf7AmXgi6LbI+WHRPJO4qlmvHckIun/E+fOj+fnST/sr2i2cec+Xq1avsyk3+RtGrfQNK6kj X-Received: by 2002:a05:6402:22ab:b0:46a:abc8:8018 with SMTP id cx11-20020a05640222ab00b0046aabc88018mr51525616edb.369.1670442804576; Wed, 07 Dec 2022 11:53:24 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id cr21-20020a170906d55500b0078d49f0df9csi18128265ejc.453.2022.12.07.11.53.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:53:24 -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=hf7yVovr; 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 5A1C2390CE8C for ; Wed, 7 Dec 2022 19:53:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A1C2390CE8C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442781; bh=CpKt0hL+R8B0WkeaO71z2ljN4wkt69Z7CrE1wZSAdGc=; 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=hf7yVovr7fdLUKpEabDPDEeCijCUy/7CtPPi0D/QScP2ICqe2eIeKc1WvRiTVLWbT K0xZFyCi+0E2Bi8Ar3AErbuz6rrYq8m8gaUCui2viPNjxhX7rUQhq6I8XxIax68gKC iLUhEc5nMyA3oUyJkWzqRe9VEwcTE+rE9MQhyOqA= 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 DFD7A388FB65 for ; Wed, 7 Dec 2022 19:52:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFD7A388FB65 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 2B7GDnUs010606 for ; Wed, 7 Dec 2022 19:52:41 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 3mauf8h7jf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:41 +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 2B7J8YT4017074 for ; Wed, 7 Dec 2022 19:52:40 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3maa5ycnht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EU+8zXUjIS5UJQx9f3DrlxjX+EyD2rVw1ai90HUznXvOJmf/qvpQe7EOSZMGjvLjS1UwBr5KNJW0eNaHRb389os9G/54Kin82dzzFp9UyhwqIqKvg8aWrRWntTnMj/SpyDY1TgqJjlq+Giir9qO6prbWM5sPE5VHMkdCYF4aCBKCgRcF4F9WrLVXnU8GCCEc4t65P5WOE3Y5ZUuI/u5seJcAhUK2GDqqqxbPqBYpihYSe18sntPbC1Ww7OcuBovUu2USVy3YmGfo0P5TenTr6o/w5+a3COEGyTVL6TQ97sPxwmRSg2o8y3SUBuB9yJaOpqDXpKr3XL6jQ3Gg68CwZA== 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=CpKt0hL+R8B0WkeaO71z2ljN4wkt69Z7CrE1wZSAdGc=; b=hsDG12OJHxixGsD7xBR6p1+XPALpSA97zGXsU5kwUGjlTsCO9ni7VYdwx9s4Rm/GjY6wopQmfi62hSlZesFcYtQdRZMCVvMxIy4KeUUkIoOIGK8EVkh0SwA7hrb5YDfQEpZFUK46KXDIm3ZrfsjMwdQfaFoiV7nTA6CsZ2j2sZS3gco+kC2YMLtetfHvMlVP4TzMx6bXPzxExd/h+20FtUFMzmQ3VvMaAheBPMad2NCMBKta4lOIARAKfdmhYHfcScKz0nDZiM9fgJPkxZj4Z4ptoeK8yBAPKHIVl29XVxZGRIGrmXo8YELBsDFyt+2dDGvNCw8mD+eZAyT0J3L5fw== 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:38 +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:38 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 4/6] gas: sframe: fine tune the fragment fixup for SFrame func info Date: Wed, 7 Dec 2022 11:52:20 -0800 Message-Id: <20221207195222.1182788-5-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: MW4PR04CA0163.namprd04.prod.outlook.com (2603:10b6:303:85::18) 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: 34bfb813-21e0-4258-9a99-08dad88c97e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: faqpTQ2CJOW6waZV1ULoY9wWFvLNx4e1uPc3tYh3o7EToUCbrMymdV2BlcbnEqJE50jd6Kd6tr+mADzXuCqHjtypFQ0Lt/zbTrmJxlplRTu3iTSwOlqKHtG4rMIud3enLU6Rh3VTZ3jh6W4MSqGpiG2jQt0jCPiFBkDBTjUePecE+xqJHmmlCEaTaS8D4NpMoFN9bzq3FSJ1ngXKlX9ljVKddJoS3hKhJc8zZAzalhKSn0BNDqYBvr9rUg3BHRsQLFjM10O4Oh8GGhB+YoNggdWkFULvhXHQElY5KWWnQQya9dTrG32OYY0c6WRZ1ps0eVuqbBN7/MWBzowiseWQJ6dHNs7GI4k23ZCL5NfPh8+8fd7gZAvCLMBgkLB9BEEpUzTk6H/CvjOVQ41fGJqVzRAzOZhiOYlXntxk4dYqq4upN8F2W2ixKV6HNRUTmuGEDko3ttqastFHgzLIs9mWqKrmJJBOFpvgvxUsMPanVXXqyQYR2Dv5tVE5YcSYvv5SC+080kIWXeCmXkhf/nb38+Y6tbYN6VK0oY7rPhZn4CAElvDbTj8r54htFCQ5at5QGGcv7k8HvwCj54DKeuTQ/DWzr04PKFfONLaYSlJXMH1y4snNlHf0XVfojCwPT+Xzff88hHT2McOfPhJycSDGdQ== 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)(66899015)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p8K7gWT9kE5V8f9Pqac6ULD+bk+VyGcLCbC6UJd6nCADAE3/wn34R1TkUkYLsBa/VlG8u3BB4oJ4OX2W8gwOsOUKp2eXjfbEE3vQxXLJbmBa/V/qlkIdIG6ew6BUsYte9t99e+IWCRbXEw/lnmgGAVAvgwqS4TyoyTODoprVrlH7sbj6BgNjA08MaxwVmJ4MH1gNQWdyLn0YcUrYH4jqI/s0ZJzxBUKAhwWEFRvG5vWfuINRz3QcvwFUYBRa+itfod5lWEgTHrjHfZ8Ok2Sdl/vNhTeursQMVJtaONNkUBZcbF5aUArmT4XWkeKF3rcw1+YwF4xtdbdmrlTCutGAWKh0BSMupEIFzTjpycj0lacu1okqDz++nBM9DIL+H1Y1/aSPl05lupC37LSIxt2R8aTw21AzeH6gjLRLDNVab0xt1aiL6XSxO5RU4cNF5oISRYe6do9qpY4XVxiVVqwSCnhCWsFVfm4nAQExclNCsAVionc48iY7rJsCIYfm3qiwg0ZzqM3w+TVxl6N1sHrI84FBmnmwwxtJVIkjxbk24GvWizu+ZyTpzVb/MEIsvT4mRerYAN7UpnL0a5v266ZNUAj2/4KWgoV97f0EPS3w5aUR83lHTMCri/E3oqD4/JUKArsZJEDz8lqMhie5Hq9UuRQBb2kvsxAxNZDXbomR82c3pzTLG3cfx5U0FdSvkDj4AkI6bz/Sq0/RNGdi7qD7MLlqdH6duyuw3bHFFOyPgzOS2kvSFxb5C1Ur+3gxpF/nw80bNwSGJjUEYgkRSzF9vOTRZipCILkJd1d8VEKLGF/s6/pvKBA0HNxjO8FuSKGNe/LjL9e31CpmV6QnE3a6wJ2WRFK+GBbClGj/Hz4hLbffv2ECUZYiaZ1CCI4s3NWU2u8IXruEW/EnRLLXY6UuOiMWTE7aGgZslAaRlLKNlNt6n6nDsJwQG4CswNP24oYlfK8vQS2sEfl00yDE5V2Du8PcocRqQhws88EGTaELmytd5R45LO1Ryc2C2esnkrWGqBBDPKnYSjJtO80j5NAFBIDsfqevfK9jII3Oab2UfhE41jMrwKu1s1PVU5Cw0x1Zg8dMQDG8B/TaJ5h/IM62H+A/UMX+9dkcmlxO0QD91PLeTPIoMlH75q0StdqN8hKQSKME1aw8A+/N1tHi8C7IT9lZieBCRYqoOwbWtLIGWem1m/e1uTW13YC41Uy7vwlfEWwRdPM98iAE2U3xEBGZavBoqyFOIrwkmYOFZsiW14lE8nTUrXQdJ39axNZPnHtDoMlJuqsD094joCm0BcUX1ywn0aOmmJmRcbAGYrEFuTWWAcsx626E0TLrIdpE3jgZEx0cYQMI/lY2sFrRnDNzFQ02euXuoTALkYaec6wOho1YW1Mo/qS0Z+j48wS1tqwWL+Xc+12NqYmFLFWByaNNTs7zObyIZ9Djd5LxOziEL5gSDh4KaAaaSVxDxYghgfd5rMgna6+whSTIkYgBMzC4XRl6ZCBGMFvG109EwQePFLRCvMMwYi1Y5g9xI0n5yvotC3pz2SaStY+p1xiryWVVwJYkr4eiwA3hwnvYYaEORPPTjiXdos7AxPgRx4S7QqHcJTEn6klqYTGpXuvN44n67C0EgwVilj8A6CLCKuo+5Gg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34bfb813-21e0-4258-9a99-08dad88c97e7 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:38.3155 (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: r1gA1pVqEc3DM6qKEfifCAPZ2ah/MujLTXL/NKGdbpdqx9d8uAucMV/b9gmiCcpeajxwq1d61CcmSBAS5scg6w== 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=967 adultscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-ORIG-GUID: T3TG1HuhB0mwTz9KokVS2EMNZTs1lY8R X-Proofpoint-GUID: T3TG1HuhB0mwTz9KokVS2EMNZTs1lY8R 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?1751586234110491678?= X-GMAIL-MSGID: =?utf-8?q?1751586234110491678?= SFrame function info is an unsigned 8-bit field comprising of the following (from LSB to MSB): - 4-bits: FRE type - 1-bit: FRE start address encoding - 3-bits: Unused At the moment, the most-significat 4-bits are zero (The FRE start address encoding of SFRAME_FDE_TYPE_PCINC has a value of zero, and the upper 3-bits are unused). So the current implementation works without this patch. To be precise, however, the fragment fixup logic is meant to fixup only the least-significant 4-bits (i.e., only the FRE type needs to be updated according to the function size). This patch makes the gas implementation a bit more resilient: In the future, when the format does evolve to make use of the currently unused 3-bits in various ways, the values in those 3-bits can be propagated unchanged while the fragment fixup continues to update the lowermost 4-bits to indicate the selected FRE type. ChangeLog: * gas/gen-sframe.c (create_func_info_exp): New definition. (output_sframe_funcdesc): Call create_func_info_exp. * gas/sframe-opt.c (sframe_estimate_size_before_relax): The associated fragment uses O_modulus now. (sframe_convert_frag): Adjust the fragment fixup code according to the new composite exp. --- gas/gen-sframe.c | 55 ++++++++++++++++++++++++++++++++++++++---------- gas/sframe-opt.c | 34 +++++++++++++++++++++--------- 2 files changed, 68 insertions(+), 21 deletions(-) diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c index 896fbe44c6b..075720facd6 100644 --- a/gas/gen-sframe.c +++ b/gas/gen-sframe.c @@ -396,8 +396,8 @@ sframe_get_fre_offset_size (struct sframe_row_entry *sframe_fre) - and are themselves expressionS. - stores the expression which when evaluated gives the value of the start address offset of the FRE. - - stores the expression when when evaluated gives the number of - bytes needed to encode the start address offset of the FRE. + - stores the expression when evaluated gives the number of bytes + needed to encode the start address offset of the FRE. The use of OP_absent as the X_op_symbol helps identify this expression later when fragments are fixed up. */ @@ -431,6 +431,41 @@ create_fre_start_addr_exp (expressionS *cexp, symbolS *fre_pc_begin, cexp->X_add_number = 0; } +/* Create a composite exression CEXP (for SFrame FDE function info) such that: + + exp = OP_modulus , where, + + - and are themselves expressionS. + - stores a constant expression where X_add_number is + used to stash away the func_info. The upper 4-bits of the func_info are copied + back to the resulting byte by the fragment fixup logic. + - stores the expression when evaluated gives the size of the + funtion in number of bytes. + + The use of OP_modulus as the X_op_symbol helps identify this expression + later when fragments are fixed up. */ + +static void +create_func_info_exp (expressionS *cexp, symbolS *dw_fde_end_addrS, + symbolS *dw_fde_start_addrS, uint8_t func_info) +{ + expressionS width; + expressionS rest_of_func_info; + + width.X_op = O_subtract; + width.X_add_symbol = dw_fde_end_addrS; + width.X_op_symbol = dw_fde_start_addrS; + width.X_add_number = 0; + + rest_of_func_info.X_op = O_constant; + rest_of_func_info.X_add_number = func_info; + + cexp->X_op = O_modulus; + cexp->X_add_symbol = make_expr_symbol (&rest_of_func_info); + cexp->X_op_symbol = make_expr_symbol (&width); + cexp->X_add_number = 0; +} + #endif static void @@ -538,19 +573,17 @@ output_sframe_funcdesc (symbolS *start_of_fre_section, out_four (sframe_fde->num_fres); /* SFrame FDE function info. */ + unsigned char func_info; + func_info = sframe_set_func_info (SFRAME_FDE_TYPE_PCINC, + SFRAME_FRE_TYPE_ADDR4); #if SFRAME_FRE_TYPE_SELECTION_OPT - expressionS width; - width.X_op = O_subtract; - width.X_add_symbol = dw_fde_end_addrS; - width.X_op_symbol = dw_fde_start_addrS; - width.X_add_number = 0; + expressionS cexp; + create_func_info_exp (&cexp, dw_fde_end_addrS, dw_fde_start_addrS, + func_info); frag_grow (1); /* Size of func info is unsigned char. */ frag_var (rs_sframe, 1, 0, (relax_substateT) 0, - make_expr_symbol (&width), 0, (char *) frag_now); + make_expr_symbol (&cexp), 0, (char *) frag_now); #else - unsigned char func_info; - func_info = sframe_set_func_info (SFRAME_FDE_TYPE_PCINC, - SFRAME_FRE_TYPE_ADDR4); out_one (func_info); #endif } diff --git a/gas/sframe-opt.c b/gas/sframe-opt.c index 6901aa82a77..f08a424fd88 100644 --- a/gas/sframe-opt.c +++ b/gas/sframe-opt.c @@ -40,10 +40,10 @@ sframe_estimate_size_before_relax (fragS *frag) The two kind of fragments can be differentiated based on the opcode of the symbol. */ exp = symbol_get_value_expression (frag->fr_symbol); - gas_assert ((exp->X_op == O_subtract) || (exp->X_op == O_absent)); + gas_assert ((exp->X_op == O_modulus) || (exp->X_op == O_absent)); /* Fragment for function info in an SFrame FDE will always write only one byte. */ - if (exp->X_op == O_subtract) + if (exp->X_op == O_modulus) ret = 1; /* Fragment for the start address in an SFrame FRE may write out 1/2/4 bytes depending on the value of the diff. */ @@ -92,8 +92,12 @@ sframe_convert_frag (fragS *frag) offsetT fsize; offsetT diff; offsetT value; - unsigned char func_info = SFRAME_FRE_TYPE_ADDR4; + + offsetT rest_of_data; + uint8_t fde_type, fre_type; + expressionS *exp; + symbolS *dataS; symbolS *fsizeS, *diffS; /* We are dealing with two different kind of fragments here which need @@ -103,19 +107,29 @@ sframe_convert_frag (fragS *frag) The two kind of fragments can be differentiated based on the opcode of the symbol. */ exp = symbol_get_value_expression (frag->fr_symbol); - gas_assert ((exp->X_op == O_subtract) || (exp->X_op == O_absent)); + gas_assert ((exp->X_op == O_modulus) || (exp->X_op == O_absent)); /* Fragment for function info in an SFrame FDE. */ - if (exp->X_op == O_subtract) + if (exp->X_op == O_modulus) { - fsizeS = frag->fr_symbol; + /* Gather the existing value of the rest of the data except + the fre_type. */ + dataS = exp->X_add_symbol; + rest_of_data = (symbol_get_value_expression(dataS))->X_add_number; + fde_type = SFRAME_V1_FUNC_FDE_TYPE (rest_of_data); + gas_assert (fde_type == SFRAME_FDE_TYPE_PCINC); + + /* Calculate the applicable fre_type. */ + fsizeS = exp->X_op_symbol; fsize = resolve_symbol_value (fsizeS); if (fsize < SFRAME_FRE_TYPE_ADDR1_LIMIT) - func_info = SFRAME_FRE_TYPE_ADDR1; + fre_type = SFRAME_FRE_TYPE_ADDR1; else if (fsize < SFRAME_FRE_TYPE_ADDR2_LIMIT) - func_info = SFRAME_FRE_TYPE_ADDR2; + fre_type = SFRAME_FRE_TYPE_ADDR2; else - func_info = SFRAME_FRE_TYPE_ADDR4; - value = func_info; + fre_type = SFRAME_FRE_TYPE_ADDR4; + + /* Create the new function info. */ + value = SFRAME_V1_FUNC_INFO (fde_type, fre_type); frag->fr_literal[frag->fr_fix] = value; } 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; From patchwork Wed Dec 7 19:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 31015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp377179wrr; Wed, 7 Dec 2022 11:56:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6rhOmocesb3cvC/FK3V4yaL7JwmmI7Tz1lVFqgOVmi8HNIQafs2jyS88oSmSLdW30ou/Ly X-Received: by 2002:a17:906:3e41:b0:78d:bc9f:33da with SMTP id t1-20020a1709063e4100b0078dbc9f33damr75978944eji.80.1670443010817; Wed, 07 Dec 2022 11:56:50 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id rn5-20020a170906d92500b007c0e314d945si7120525ejb.654.2022.12.07.11.56.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 11:56:50 -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=NtLBTsTY; 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 1AD02392B13A for ; Wed, 7 Dec 2022 19:54:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AD02392B13A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670442897; bh=SyI/M21AuCIHdnh05jmfxld4VvfQM3cFgpTXiIyVbwg=; 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=NtLBTsTY3pQ4H0OvvyZ9EO8sN7T2JrtNlRtRvf1TWZ86x/PLDd7ElTSQG2WvPYWvw wU9atlDrfvywc+fMxx5xi/N2nj1iPwiYwTvxuec2e3fh6IbOD4slfzRgvpGXTtiG/a wL7hL0eldErIhnd1cLf84TVP0a855XPOfFJUoRu8= 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 94B893921786 for ; Wed, 7 Dec 2022 19:52:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 94B893921786 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 2B7IwTFQ016130 for ; Wed, 7 Dec 2022 19:52:46 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3maud719pu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:46 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B7ItEK9009860 for ; Wed, 7 Dec 2022 19:52:45 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3maa69m3g9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 07 Dec 2022 19:52:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UAVAGUAIqR+BrSryXC7zRuYqRYd9E05ddd9/BV0DbI77Jm2sNjDS8xL2aev6LRIU3y0f9hoZ2IFVGEZL3cjJjK8fvsdHTHe4qIGnmoVlSOPZSwx+ZDExKRepVWckj41hgyea4cb18PwRl31WSHoZlMbJZjKyRGqHrZww8Bfk91Usvp9bdKza4W5bLBYipqXpYWJNNgDViQH36TxuPaqZ5V4re+LVRrAIHwC0mKHs3/52IS8u096o8ZYJEtuUo6voFBJIKSyHpp0QKfr7/Da+oPuFvnmZCXaajab21PeLznlLAhhRNjAjwF6NDC/16e7kJ9mSvnVzFBeraTZDOTiAgg== 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=SyI/M21AuCIHdnh05jmfxld4VvfQM3cFgpTXiIyVbwg=; b=EOHbCXKl95cGUaK6OYpfIA+0wAY3A7sxFHguB1ER4ChjSbGKBCwX8vx6USK2bY6vVc+oEmIUg5zqwuJCN0PFze6pINxfRFLwyq6PgP6HZdHN/NkwSZbBUkQomcgHLMv3warKBzmj9ohKEqd3Qd+U37uUnPc39X72GUsADliXDoEqzOfzXKf8/Vxw8wG2RV7j01fTWwJu2b8HiHjI2VBDbOhxGBOL59x+/syMK0a2hWXjdH+h2EBpUcxwFGBx7QxGUMWCuZ4fwNAQbUqzrfhF6T32My8GeTLGfXeKqOW9bFufIvTkEI+5x8CBs9dxNliiWQ5Xae/1OEZGw0ApfAJcxg== 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:44 +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:44 +0000 To: binutils@sourceware.org Cc: weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH 6/6] objdump: sframe: fix memory leaks Date: Wed, 7 Dec 2022 11:52:22 -0800 Message-Id: <20221207195222.1182788-7-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: MW3PR05CA0007.namprd05.prod.outlook.com (2603:10b6:303:2b::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_|BN0PR10MB5125:EE_ X-MS-Office365-Filtering-Correlation-Id: 045841f1-5b2b-436c-3ba6-08dad88c9b44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q3JLZbw5NxX0uR77nXdG1ZzIWlXzvcAT5mXn4d8W9trB2Dd3MoRBVeRQvbuQHQfEcAWGeV1+ienD+TBPlPLOiPrrDmYmNY9Sw/7LMi/yX1lTvGmBLiGa5EHJRV3cn4+hU6rLEgPzZzy9bcbUlYWm/XUu417QMcE7REH5ShJyQpZjJZgEE4EU2XRDoZwVojSKEwPzIsf7HHAMG5p/svXymmfUVJmuro6jntygWTVpWLT8KcFe1XkHjKiDKMsIXgv/O5lf128qPI71V1AYz5l4ZGtk2HRmrqTkDwtdgLk9uBBB+lR7QEoiA6Jmk+NIPxY+SX+sMY8IqG82H2m7UvtgRLhAKUYsQYN6UAZd7TQylsxo6rqCHirgPtRptfdOy704hkxS9mqsd2d8SEf6Y3rQsR/V87kCPjymX/ZfVKjkZ5Z1tQRi2IDBVWh3DNAu3SkdKe//5CnmShJ0PloQD4/z26GNHUGGuBnRhy6Y6ELUVI6+j0Xq9XrU9XSBONf0KKHcaUE17dDBUyc/EzogLQ4qFONDRdkd0wI4/KuXfPWtQQcL9BbfmvEH4ylm5U4dc7P5P7Q1oMQWqyXIM+EGEiweniK4el9t1UJdn+SsNNGjku9ovi73QytvN3Xm6yFpTiuSYsB28U0f8AkrN9TIqVZIXw== 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)(4744005)(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: /AZTLTmJg8kXA4r8+jQ0lZ/hkGWNXxjIJ0C4J7tFLuJaYgnCAyZR3zwfnrIS5N+V1Xb/8A49+uRmuipVA2Fvu4XYySXOFv7luCeJxUr+6Zx+h+Lrj3dzLrwI4CbxRa8cnfAlrCk1i3/JTdJaPdAod3VbiT2JqImDoC1dNBgI37q8NfAUJBZ2q36V/TWQAmhMItK/U0fQ2wxjToDOVxkCbz8U8BZZLa/H8p21mElmiJkhxEK3MRPk1j0tNvoD+0M5crV0QqyJWwLSVLxdpODqHqdrNGOeFLEJzjCVs8H/Pvmy4Ew5ZYEXiYX8wt1BKcBlGAhz9c6jfUfaLdBbZlNNUHUC+WrjYLyOkkUZblz85Mgp+5fpM/Fw2WM8+6i5OokQAkszC7rnUCYtR4bsvmJ1CAaBBBVvDZWIlZx6nz1XHkWP5zanQXp9BRkt1GSKy05pSKmyHxychF9FI8PyGMyzSet4iqJNF1vn91JtCTFu+HEmOxI1ijAXu6EpaDYXk79Ee/qiqmAO3V4fn0abV0KL7EH0oLwbj9Kf8griIzAfqwDmnFVqKAee2grivUz+7KB6hf0LVcHua/u05uziC5BntBI4I4QUbO05FNtKmp4VvLdNXLTvTi5cHYUp3udfyJCWG5eAnFk29JfbMWPJoY5TrsiqZVUvcjCSjWDHDrQzRC4NSF/qAFac6N3N5xDqRqF6HaOQv+kX3PlxS0F7voXG6vtAUCoolxVSnoWb9ge3a2RmGD3C9QBse25moWG39SRS60sXysth5MP7rEyDTlpZFCc/M/ABFhnHPrwZDMJ/7pNDh3E8MNvDAMcgT6HFcivDRRmJuvxJsNrAiYFP0IWqvquKXUen6duIeU3yRuHBw1mTuETbYsLncI4r4h4RrTKrM9bqR5iKchBCqtL+ltH6XGTIxXF1YEB1JhIkZLEk0d4mYvd6BWzj0rlKWdWsPtqQLKJmz84oTP0Zh90KduISfruCBn8PILsGMVojwhj6+xT6W+WD/K2ArsjY2PMb4GWT/yYnV/8IuZdhrS7sjc690drGzUaOAkHqg0gEyPylXseQQ5src7AqfMmrRgbgdC5ok3KxtNZ7bRp8RhkWohMQenTeKwcaDq1JMSdUhM9iNKWWAepXALvlGFbkagxVbJmnmvGtiyT1sfS0MM3nU4e+5KPedfckyMVGIZIHLOGPp9CeU9XCg2q8ozuPS0EYvdhkOYB1hY9Cn+ZwMUHm6Q2xQoJTZKAEg71WT25wX3rpSKk5h+o3abNksJ6bZ8T/KbO9Nnd/Q2soe/sM3nzZGqgJm/F1ZKIAWmdD3Kx0ywjuaDYWIQgX486QKI/kMMI0FjVjnQGifO8GfVfbauF3G29j4en7U7u24R0HLSb6VBHriClsLfssrP6h+bINSRa2Z/jgAZr56siE0TXdCWVQSs8NH9/YQH8emzNTtxDtBeUZ6iCxG2RIBC/xkVl6ebYbGIJP6mjyCl0v4DSxPlEnpsnhNAhkar+XR2/50GLl3P63w02tEcm4vYPWS3hncfqobmINFTVRT8Pv1BGiecMm5SZGH72/lR1fFNO0rn80BnwhDuVuChtQENWpvcf5K1NChvcVGZFVBu9chVD6Awyv7YNgltEVdgT5Q+aiPzM0FMip5zU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 045841f1-5b2b-436c-3ba6-08dad88c9b44 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:43.9557 (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: hkLo9Ctjo6/Xyu8Rs3CFyhmfOcyN7N6Wm/rX9wVklelErmXfOvpXCDG1T0+77Db1J1j/zvHzgTuHIJyzwkTDFw== 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 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=896 spamscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212070167 X-Proofpoint-GUID: C92rhKtbrC4YIuNhBmLXpA0vKJp_sJNc X-Proofpoint-ORIG-GUID: C92rhKtbrC4YIuNhBmLXpA0vKJp_sJNc 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?1751586450770954108?= X-GMAIL-MSGID: =?utf-8?q?1751586450770954108?= ChangeLog: * binutils/objdump.c (dump_section_sframe): free up contents and SFrame decoder context on exit. --- binutils/objdump.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/binutils/objdump.c b/binutils/objdump.c index d95c8b68bf0..6695c5d343f 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4871,12 +4871,18 @@ dump_section_sframe (bfd *abfd ATTRIBUTE_UNUSED, /* Decode the contents of the section. */ sfd_ctx = sframe_decode ((const char*)sframe_data, sf_size, &err); if (!sfd_ctx) - bfd_fatal (bfd_get_filename (abfd)); + { + free (sframe_data); + bfd_fatal (bfd_get_filename (abfd)); + } printf (_("Contents of the SFrame section %s:"), sanitize_string (sect_name)); /* Dump the contents as text. */ dump_sframe (sfd_ctx, sf_vma); + + free (sframe_data); + sframe_decoder_free (&sfd_ctx); }