From patchwork Tue Dec 2 07:34:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 125736 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1EFB64CCCA19 for ; Tue, 2 Dec 2025 07:39:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1EFB64CCCA19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1764661180; bh=RO3EYwKkEvCO7issV5sB30TNyxjfxInP+oAJqg1KIyw=; 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=qrC/McA7ZGIsaZLjYvX4UG5rbmYRap32Tzq6iwfPpj/3i098TIQ4pwLT9/MuSORuO UqKesgTGXUzYC++uWuhbgo2Tkw+C5LaziHanCMHQOOjfmkAUsS9w5ietkvdL2Nm/vi JKpOzPduT9CnLZf7AQ8sW7cGVq+EworMjdy0onKg= 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 5EA1E4BB5890 for ; Tue, 2 Dec 2025 07:34:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5EA1E4BB5890 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5EA1E4BB5890 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1764660884; cv=pass; b=nYcC9cjOzb9U3tZH3zGankalc/QKqQMkgQf0Q6CQyzbIpzZrpxzHwDSP1JyoRfRmF5zEssSvsG1JXcn1D5XgQql7KYlGR1LKFGajKOXUMaFrqpx4QHZpmD0L5Ou5L07dS7nSLvBGGcx1HyjC4djX1P46ifBz+gY0GKa/TMcvt/M= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1764660884; c=relaxed/simple; bh=OWd0DuzVJHm9kmRztzQKZg72zr8h7V9K7lpSCqHuHWw=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=EAjcSLruRizfvSBAVQmE1/y84d+z31QbqdxXeaTEwLGvf6kS8G4tEKzgsreR2YbcdXrfy0xtj4CneZu1HL7LT6dpDM9/hYwnnQ3W4N10O12iRAVqhUgpFpdwYQjl88wOOpchmbB4Xk35XlGvybGHCUHZM4plT/K5zeOVOXa2V34= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EA1E4BB5890 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5B21NeY33294794 for ; Tue, 2 Dec 2025 07:34: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 4as7cp29we-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 02 Dec 2025 07:34:43 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5B25aWRW016429 for ; Tue, 2 Dec 2025 07:34:42 GMT Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11010012.outbound.protection.outlook.com [52.101.85.12]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4aqq98sqq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 02 Dec 2025 07:34:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wMdEjJg5eWTLANBNwNDCylTUsb7RfHmxBOVO1dT7BNZw7EHGJ5driI0w/wSQnEwfcvD+mfTGyw4Z/WcGuczzlHucez4whhPH1UsUbjGVVrrIhjO2YQSPh1w2+ae3E4j/CCZPPNZu0WkWQqxw8HfUAZopgvcGP24Zuz8p4YJ5/A3OSKuqp7vCo0Ca860mGIFZTCEma14T9dvW43fsyPIGUGvBx2QsSNFMU9WID2UWBxYAB29RZXflZeIEbZEwGBBAI+kQEqFXWk3DZfG5lxi1O9STN1sZftrN2W7U8WeFpt7OfKi/bqfX6Cd5S7BNdFFxg3xIiVhDCTunSfwbg+Guuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=RO3EYwKkEvCO7issV5sB30TNyxjfxInP+oAJqg1KIyw=; b=FR15Rl5YOikSja+bLLMZX7YJsY2NujGHIo8ReFymcn8ZCrj3vY7YXGTR5PCZfPRYvRcn6tXinFalB5qvf1EP3IBfRA40JjEBk87AWFBeHduRa5fOea6WfBWQaP2KK3oZ+5Y40Lt0CeyaB/eMBRVguFAo6r+CrL7EvLGmj88FYBoYxbHOuCPkfttEFt2tsGq3R06XgY/P5EqGZaLTOAlgkDVI2a3kG+m+UKOomP3i7umHB63h2X6bQ61Gj6+iZmwzyyUCaItbg9Q60Bl7tlTVGN2rtokWZUoPyIQGgWFl+eNS/L8BaK+1ZBgRrONqBbCBqfPT2v77KGxpz7TxIdjwzw== 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 SA1PR10MB6365.namprd10.prod.outlook.com (2603:10b6:806:255::12) by PH8PR10MB6456.namprd10.prod.outlook.com (2603:10b6:510:22c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.17; Tue, 2 Dec 2025 07:34:39 +0000 Received: from SA1PR10MB6365.namprd10.prod.outlook.com ([fe80::81bb:1fc4:37c7:a515]) by SA1PR10MB6365.namprd10.prod.outlook.com ([fe80::81bb:1fc4:37c7:a515%5]) with mapi id 15.20.9366.012; Tue, 2 Dec 2025 07:34:38 +0000 To: binutils@sourceware.org Cc: Indu Bhagat Subject: [PATCH 07/13] gas: libsframe: use SFRAME_V2_* macro where available Date: Mon, 1 Dec 2025 23:34:08 -0800 Message-ID: <20251202073414.200246-8-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251202073414.200246-1-indu.bhagat@oracle.com> References: <20251202073414.200246-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR04CA0140.namprd04.prod.outlook.com (2603:10b6:303:84::25) To SA1PR10MB6365.namprd10.prod.outlook.com (2603:10b6:806:255::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR10MB6365:EE_|PH8PR10MB6456:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d0447db-f9d2-4770-0a64-08de31754000 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|1800799024|10070799003; X-Microsoft-Antispam-Message-Info: VCx+GBcMfiD4Oejfp7cipHR4PM6tO6M1louuzD2lCyQaNFdHfUPOrRBbsPUE4RNYJnBji58dm2zWtcTxQzdOo8jkRIE7LkuL8iZbte0NQ6YGVNOoeWq8nO+trdfcZe1VbVMfmT4xVfOvAPPnzLGUNIhgdHC9K/nlvQzLIGPBhDl0F6Bh3dz5zm4Knjq1Z7XeibdmxT+dgi03ZBBaeK5UhxhqvdpgXmqjY0yk/N4aEldMxnottZjjh6TeGtyNVDgouaGNJb+C2hpFMBatOITjZvLuWi8JTV02tXYHoW13MgMvhc6Y0BEiOi5IC63OhxpucyTkkwsfCu3f/4eknlw61c35axoihriVbZcI/6oZXBmFbnOWxdcHXUCtwVRW1qZj3lvU/rSW61uT2o1LK039pZ7ue6kaNmvhSBbxcuMmtkbpwHFPCJyTOsasc9R8eWAmjysmhWvEodX/brCaofJZ1QlR3XBdbMfOLQAlwja3bNckuDWSZ8PSl6l46rMaVYCzoX6sEdnDKuWc/loDkRGfKHwTcY7eWNPllcu1nTg/kONt4jvON4IhkTxmrjF5LItk9/Slm745iMei2AB0Ug44dZsGO1dH4ycM/5eD5KXmtaHhtU2Q4mHyYKUJ0FO2qhvE0Bq9VcgTGTVOH2mpDWzr12eheghWue6C1LUPJPTGW2UC9fjgSP8Nbm0UswRrf/3WykKSkdS0oXiZ032TbVczEwoElaFpUV8/h4sWjOWUOOPw1WG9/YXdFQBynPJKDesvktIRdy2/nlmSR1ILtxKOWcK3tF4se8RO2BnHY8sYgU6DtwUovAW41Ul5J0vWrPd+LrAiuasVKvBXgR3K3G/ozekQSPgvsGDs77hpxLANYETMgOjN0Eev9tXGSW2uuLVOBl+bmcLs426Ml+2BdfN6iSQAGpUtHWL55stXbk18ElITzPP1+7yDANJi7byey8iIH+6td8nVpzA/sXFbbh9SfZNJH4O4P+/3VSr9EFIhH1d1b8QCp5VhjncbdIvpJgEQqFtZv7uck1vlbgvWCzVh8bKu2Y8s81MgBmUPRDwUQGUXSn86t52jnBVYIw+93HckvxeY9fBlyRIJ0GA/iJA0fnooNVvCjLPDH2j+xvKYg6zr96Kjk/P4sUURcZGq+iZlP498riy/gTmhJ2vRQQyCTrnKL5JsnOvxCpGIhJEgFeAvuY8LKeZ5o/GjF617mt5D580TmlqOiOK7mlzxEDMq5BdIQ5rwoVDiHkSqRNI8WvvQNaorg1LG6YGlNkPKmoFqTxe2q18t1HYAM8Tv9qkqSLsHg+vGJ/SsJXhWnZ0lCT4W7es8ktQJXLXLVLARjwchaKheE5j4BeNnsP6V2LFsdpw1LqK0iabv7RfGa2lsa5/EXIlpi63kSk+ISCb+7Kzh2SZ4fKw/u8gxN8z6TsbJMK3+sGCMhm+7F8t25wlTfgwTZeOVfQKrNQ4ZCb/TBipt X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA1PR10MB6365.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(10070799003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wtCQCiSNA2Zn7FgKIBF7ldEr6XU3o0zGrIvGaipJAiTsKV+yilS67QRdEnLvijeN7ToPiSSubWUgWKs2NCX1uPfWMP8mVZr6Zs1Gkr/6TH/7mc2sQ13cYALoX4EnUoa2fJ6vzEGK/qynZtmT5oGExvDfj0ersZPg/7Kre6mziWHWCqmIU1hhz3NZhMcVxAGGy00inGmULXxXf49FtDIu4BwUxaDbNU5ST2WmCMZT/ePP+nmPqPjKUCejOHZv3/O8uopsAx+Gj5iKUmph2ySWhOGqSTNw8if/gUrennd2D1KxsCqdjyHZBIji+1+3iH36UrqdkkHyNXQFqe88KT66dQa6M/F5CvaA4sJ9JeCJRdLVyv9bDZpSeag8Q32sID6ILp2oBS4ehnExCC5wc7MfvIt+HYSCu5MbHbyfIRxxdsF6pjYubhdiVhh3sjcUxQzJ3wujGGcdHhs6nnQ7nyR1F3SuSCS4DwEOGJjjtBiOOh78TiQR4s7D9HehvISzFPGHx1/fHBbZdDGHWGdcs3nutYtCTZQIOVHkf7uh5xHd/MNu/13Lqc+1xNKCscPB/eoQiV0pJpNB2sfln0bZ7NF6/zDD+jr33F3uPYM+8yn2oPHtbiYAIEOS2zRl2nRUY82YzbxhU4FWe1wfZyEMueT5Prc39KM7qYIjLuK36Vp2KOusY6HRLPmOWychBjOmloefEB4pQUm0CwjQCKzcXDgn8/AsS9uVS9W94oSAQ5B/TwVPA+COft2mmDbVobkUCp5dgdo9HtTcTEF+OmuAgc48LKqDuiT7kMNkZSv5BgfE0Po84Mg3R4Pn9Z6lz7Al5zK+RsB2AhfVE48qoXEXBC9DhawrKsZBGSfw19a7/tnpYs1qbiHZqxSzl5T2xLYgFuJRJ6k7UEMlfUZzZRkxUvqvRGczSmZBagy6uijLVvsMUqwBJD97YuieCpaJvDJmBRvzDi3vJ9MpkOUUvkit+gvQkcM0HnyQ0QFAgp3P5i7wgnpmNeALpwemje2tJDk2au/jPoisyu+TesIBT9L+aiXhkJ4JpLKvOtvL1IEBDoZycD2I2xPVqMMP/EVW/O5tpGLqgTzap2xq5uIcds16R6C47sXZ5tLP+z+vNxeR7VPci8AQmJ1EJuFrZ9YFRxmZtQ3O4BaaJ0spVEpmTgQWPO1qg3elRLyaHAX08EwkhoqN0P5MV8EEgdUm9b4zSFFHnmEmZR6f6iTSiFEQ9i7EdkHv7sogH/zRUW0lwrf6Q3DXMAnFEZ+7phkliwKOELINUtx82nnR1zqvcrUzKobHeGEBrPrYT8LJAxC49AmzgaYyI62iFURy3jZQU47tBj7zR4cvPOxnjkwIS9ZpvqCOruRmGktGIyShDJdnDlNkt5pS/kKGpcRlICSjjduhUxsBKU6Zlbx/GDRgE6LQ60eLeq8d7ODOrfOKMhAwRQVnzJXfb5xV4ECILdoLuTWd5+0y9EnVBeo58u9U3VdEAoEPpldhc47wVSMiQFKtYgOLyrUGjnU6AjQ6ybdf/tO4tiuQGyasMui+7ESm1t0EBtkhRmYu4fUcOrgsPFW0OSdfw45sFAe7nHaMIYuT1CfY2ra/bpk5VkxNNfWiiRe5/TVB/P0AhRdkBFaEUCFCKx15lidnqmk= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CIYA60yYsSNTZviyA4lTfTqYDBmXAgGvKvUo8ELnK8TLnkPGlM/RoSAGb14MEi9+ydWuXw8E/+3F/CBUgsVDy7xL/pD/tTfPO0e0pCHexrdzxna6iOs+OBUoql/ZfaHQI1UsUBG3OhJBjtnGN7DY4Mk4PK05z+YkUC61UGCYrTMWzDsbGM6P6NyCeKctQKsoib8IXPhz+ngXQ/Z34gizWpSksUOkoo9MXjxSy2LKFD9Z3TY+rxXyAS97w0ssjWTGKrhtr1NWr0vjQHwft53735STLBvIy3TijlmhwX00SqrprpIofQQpqO0+phz7UcAE3N73ZT2B0viN9MnkMKe/a+GkFSKqj9/IcF9KS1H/FmS5wx2hMhh0t1NgUJ7MjFbLyLYeaqlqFwjV+QcNXqjtcQJNCaM+IszLq4UStecahJQeF51SCJlF8FwSeL5KbNZFWkzg0uFiILpIrd9CIpVvyU+KqXoqqMuIfmw9hUdW/QPI7Ptm7QjIrtV7zw+Ul7JqQPD61xEAZiKXzOErzkArnT6XziXTnV2e6LclyQOf/LZBM55gyTOGQhM5LoJSyNJuR9JlM9KSU7y5VBjlD6dwlClQ58H/oWCG5b8mLEijmvo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d0447db-f9d2-4770-0a64-08de31754000 X-MS-Exchange-CrossTenant-AuthSource: SA1PR10MB6365.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2025 07:34:38.9024 (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: MRl/gMjoXwX9kXz2LY06LgIx6C8XajjtFRsSnOvFPLj3C9EpWjuY5BlCLmLfoMMgkvrrn4p02zk9I4+QIPWNGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6456 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-28_08,2025-11-27_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 bulkscore=0 suspectscore=0 phishscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2510240000 definitions=main-2512020059 X-Authority-Analysis: v=2.4 cv=ZfgQ98VA c=1 sm=1 tr=0 ts=692e9693 cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=wP3pNCr1ah4A:10 a=GoEa3M9JfhUA:10 a=VkNPw1HP01LnGYTKEx00:22 a=pU1U15aHlzP5GH1fD6MA:9 X-Proofpoint-ORIG-GUID: PSQ5dofT4BRDU0aP1_bFw7ZmifmX8Qih X-Proofpoint-GUID: PSQ5dofT4BRDU0aP1_bFw7ZmifmX8Qih X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjAyMDA1OSBTYWx0ZWRfX6NGBbw5VXDgx Haiq9ozlR4HIQuGXYmko1VOR2OGv1jYG3+oOhgSyFvabwuPRpEVzdX3HUw12+KTd+GAtXMmNujH 77fDUyYXYFGAITakktCjHHcyIXZTYWGne0lfAa03maWpFFSsB/Zz3wKz+zDQL10bnwaEXX3dmnM bbrB0xgycfYRxWB1ILmOyGmhMlB/8M5w9dEKIWE54xmJCpZWbVcUa4ncInvLWK9RH09ySvGNBh2 qk1DREEbpxkn87WCVc3difKyYHxq1/xco1lYOiCPunaD+8Rc8xc8KcPlMU80TXmR4sPIx3+KU6Z ReBriIvhtOa0OW2UKc82n7SKKNoT4KeRZL/bTmzVm2V1nvgvyLCDIAiG6jcMRtQq/5pH7Atiq2N sTZxuoQLqYjopjfuFR1vHdqygbbiyA== X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, 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 sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 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~patchwork=sourceware.org@sourceware.org No functional change. gas/ * sframe-opt.c (sframe_convert_frag): Use SFRAME_V2_ prefixed macro instead. libsframe/ * sframe-dump.c (dump_sframe_func_with_fres): Likewise. * sframe.c (sframe_get_fre_type): Likewise. (sframe_get_fde_type): Likewise. (sframe_fde_create_func_info): Likewise. --- gas/sframe-opt.c | 8 ++++---- libsframe/sframe-dump.c | 4 ++-- libsframe/sframe.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gas/sframe-opt.c b/gas/sframe-opt.c index 65520734828..690617fab44 100644 --- a/gas/sframe-opt.c +++ b/gas/sframe-opt.c @@ -116,8 +116,8 @@ sframe_convert_frag (fragS *frag) 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); - pauth_key = SFRAME_V1_FUNC_PAUTH_KEY (rest_of_data); + fde_type = SFRAME_V2_FUNC_FDE_TYPE (rest_of_data); + pauth_key = SFRAME_V2_FUNC_PAUTH_KEY (rest_of_data); gas_assert (fde_type == SFRAME_FDE_TYPE_PCINC); /* Calculate the applicable fre_type. */ @@ -131,8 +131,8 @@ sframe_convert_frag (fragS *frag) fre_type = SFRAME_FRE_TYPE_ADDR4; /* Create the new function info. */ - value = SFRAME_V1_FUNC_INFO (fde_type, fre_type); - value = SFRAME_V1_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, value); + value = SFRAME_V2_FUNC_INFO (fde_type, fre_type); + value = SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, value); frag->fr_literal[frag->fr_fix] = value; } diff --git a/libsframe/sframe-dump.c b/libsframe/sframe-dump.c index a1a67e98fe6..dc856cd1356 100644 --- a/libsframe/sframe-dump.c +++ b/libsframe/sframe-dump.c @@ -156,7 +156,7 @@ dump_sframe_func_with_fres (sframe_decoder_ctx *sfd_ctx, /* Mark FDEs with [m] where the FRE start address is interpreted as a mask. */ - int fde_type_addrmask_p = (SFRAME_V1_FUNC_FDE_TYPE (func_info) + int fde_type_addrmask_p = (SFRAME_V2_FUNC_FDE_TYPE (func_info) == SFRAME_FDE_TYPE_PCMASK); const char *fde_type_marker = (fde_type_addrmask_p ? "[m]" : " "); @@ -167,7 +167,7 @@ dump_sframe_func_with_fres (sframe_decoder_ctx *sfd_ctx, func_size); if (is_sframe_abi_arch_aarch64 (sfd_ctx) - && (SFRAME_V1_FUNC_PAUTH_KEY (func_info) == SFRAME_AARCH64_PAUTH_KEY_B)) + && (SFRAME_V2_FUNC_PAUTH_KEY (func_info) == SFRAME_AARCH64_PAUTH_KEY_B)) printf (", pauth = B key"); char temp[100]; diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 8c4159e27b5..16fc3a3f11b 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -209,7 +209,7 @@ sframe_get_fre_type (sframe_func_desc_entry_int *fdep) { uint32_t fre_type = 0; if (fdep) - fre_type = SFRAME_V1_FUNC_FRE_TYPE (fdep->func_info); + fre_type = SFRAME_V2_FUNC_FRE_TYPE (fdep->func_info); return fre_type; } @@ -218,7 +218,7 @@ sframe_get_fde_type (sframe_func_desc_entry_int *fdep) { uint32_t fde_type = 0; if (fdep) - fde_type = SFRAME_V1_FUNC_FDE_TYPE (fdep->func_info); + fde_type = SFRAME_V2_FUNC_FDE_TYPE (fdep->func_info); return fde_type; } @@ -806,7 +806,7 @@ sframe_fde_create_func_info (uint32_t fre_type, || fre_type == SFRAME_FRE_TYPE_ADDR4); sframe_assert (fde_type == SFRAME_FDE_TYPE_PCINC || fde_type == SFRAME_FDE_TYPE_PCMASK); - func_info = SFRAME_V1_FUNC_INFO (fde_type, fre_type); + func_info = SFRAME_V2_FUNC_INFO (fde_type, fre_type); return func_info; }