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;