From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id D6688384DD04 for ; Wed, 17 Apr 2024 20:21:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6688384DD04 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D6688384DD04 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713385273; cv=pass; b=F4uw/W857oz+0kOvA5pIZtoP5rEI3t+KYWdZwi9rBxbqVrTs26iEVW0bXSD6xUZ9LRA4VADlVQddMjRQIYzY6B5NUjpk3sDNtHU1Ye1HvgIp4+RrPHILf8ulTejdFy5OjSDVnsMS6wi4Oqd2l+9AnOKEyQYTbjHKRP7noqGD7sE= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713385273; c=relaxed/simple; bh=HR46xq8N8DWmHd1bQca7PXjUGNrF8j63YrAD1JGWdV8=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=YdkmwS0RwuhDmHvUregrWJkznxAds84P5A/pxvwtEhsmwqi3lQLb+Z3mHKwU/rpGGDybLkl6VSRQFZuX29VSftQ37JbY7xe7r1PHiuRW9PBXf1JtIn72sO6/3jQ1pNJ7UgRkfeQHyDqjuSWXsZAAlpU+3tZQHdA0qJJYOppml9k= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43HHiWTW011120 for ; Wed, 17 Apr 2024 20:21:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=FTnxeSgMPaQjTZjCrK7/uZ0ANMJt8KrnVJTjYIv044Y=; b=nN7AcpJzXqCGmg2EibenZgIHlYLuptA/5VMkniVEfzOu59ldlSIAz43zFm2foKaXoIeg wdyLYnvVqsGNmTKRY9wzCXwhyGZN5+WPdmIf9zw68rdPzUdS9c/cgEcT10nrNmmuTrOa tc1bN7zcnCzqwctTu+COW9jYVCI8m2y4jWibKPmXY0fTRlAxlV/K4gvb7UF9uA0m3bjg yn2ilUdk+h6yp4tMQhrkiJrex4e222v/D/skVWw+5RejmFJkIaAzbICbxgnVsTOBgj7N kkm5mAHScB7QhWdF4FwZb1p02Ew5FKDHCsXZ3fcEVRD4r3GYHKE2RJg6p0WgHY3Hvlhm 7Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgycrvaw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 17 Apr 2024 20:21:08 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43HJuDsx021584 for ; Wed, 17 Apr 2024 20:21:07 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3xfggfpedg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 17 Apr 2024 20:21:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VHt8nhJOUA4spOtazYQrldXoLEMOx+9ADs7fheFmXHmyhiTl0iS5WwuKTgNx5kXM3FDHDdzOLDb/Ues4DukZofJ0TGDoFmr7UK6FsWVCggp2tR2JLCkCfCWEyHY9z6rwLvHy9r1tiV8mpERNoDlRWlmY/beRwXu+3s9vKcnXAPvrHO205k8QiCAMZjmcf4+uddNCZjuDeWhOeKowGcFwZvaV9hqpLmFCf8PXgvmakKos6X4uema6gF+8dWOeaNP5TSSx4/rmOAWYgh7pri+OGu2xKB4ViGKJe+qkGT9oNQ3mBKas1Jp2HHQD8iTtbx5eePsvWJY+wawmkWmH24tcXg== 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=FTnxeSgMPaQjTZjCrK7/uZ0ANMJt8KrnVJTjYIv044Y=; b=R5EXhiKAqES4fenOFWda3K+30iUXZMK4zYzh3hr9WDMaB/RZB16vFwlZ8+ghA4X2jLtw+oMSKqzTa3R3JFYvvQsAT6l0zPQv2sqpklY726rBDU2wurcRLP5ac4GrUDs/ujRYDXPnbTsVHWTjimc+lHkdKp/ukddXRSIGYTSJhgAHEnoDVHet94o905rTRMPK8M/Qf/W8rpOdxYRxUqorZSIGcLCxOHzA8stcPByckqBdqrPGGxZ+B4a9LNrL2NAGYeTPPpoA0jgo808Bq8sl2aPSdiHSTXKTMlAeTJFJyr8nuM17eN8gS7LSFhncoQ6G9lj+8vHI8yC1QdfJnnwRYg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FTnxeSgMPaQjTZjCrK7/uZ0ANMJt8KrnVJTjYIv044Y=; b=Cz2Udl5sRAV1dVClHj7fd8LFXQRbpKS2p8XvX3YgSinGszDFCcknenHej0M1Frll8Pb9B9JNErQgu1SBRNl00kJyP4SlG4OwuTG5LkqZftKuNUtZ/aXJiqEvWqBkV/VgbWxwUbMxuBIKk990phYXTdO4a/y5kN2rqhrh37jkwRs= Received: from MW4PR10MB6608.namprd10.prod.outlook.com (2603:10b6:303:22e::8) by SA1PR10MB6640.namprd10.prod.outlook.com (2603:10b6:806:2b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Wed, 17 Apr 2024 20:21:05 +0000 Received: from MW4PR10MB6608.namprd10.prod.outlook.com ([fe80::67a4:9544:7249:7751]) by MW4PR10MB6608.namprd10.prod.outlook.com ([fe80::67a4:9544:7249:7751%7]) with mapi id 15.20.7472.037; Wed, 17 Apr 2024 20:21:05 +0000 From: Nick Alcock To: binutils@sourceware.org Subject: [PATCH 09/22] libctf: rename ctf_dict.ctf_{symtab,strtab} Date: Wed, 17 Apr 2024 21:20:05 +0100 Message-ID: <20240417202018.34966-10-nick.alcock@oracle.com> X-Mailer: git-send-email 2.44.0.273.ge0bd14271f In-Reply-To: <20240417202018.34966-1-nick.alcock@oracle.com> References: <20240417202018.34966-1-nick.alcock@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0472.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a8::9) To MW4PR10MB6608.namprd10.prod.outlook.com (2603:10b6:303:22e::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR10MB6608:EE_|SA1PR10MB6640:EE_ X-MS-Office365-Filtering-Correlation-Id: 9589fd57-59b8-41f8-9dd8-08dc5f1be898 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ixVykJQsN/TYwA18C+ArY9BaRlishwasjogJ/veSpCBr0StbOSw+dURPTmJKTW27La0mFkLqgNTB3ymQgpp7F/NsDqjMRSLKOcc5Si+U01Urt6Eo0tci4U9DWkI0CExoCCsrvody2TJiOA6NTikEgELo/Fx7p8p3AiKD5sEUPG+l+Il06ay3bL6HOmS/V0AltxFHPAGgqkAVhYKx8oP27sZn7n3uguNiwNK+CyyJeCmrVjpJCotigYqoLE3aU/hVOxpn2eTR8A1hUsuSzE/exWdzd1DHmn1MiHZt/7fdX+jXWLFVfMM4ZWOmPNNb+j9YKYr7ikgL/13VnI9IVAbOnA7qCLp2YzQ9qmXCDBktM4HNeiteE8lqAK1dRE++bHAzonjaOldoGsv0CN8BKfWWbk7FOpfKWWVsN4manojng7NofsO4Uw0mq7PKevFf3+S6W30IbH+ifhRTZwuw/SybxbFVUWgW+6ct+nK0WJVjhVXRkl5qTy+zFs4ZIjqQWXuR+KOKSa/VXpyW2mmHcRsg0p0h9sKjeBUkwvIbipjY+95NL8KqZmrwa8bfxtQFkKV97ES4xjcSb22enDzFUNhv9RRRA/CLssEq9JhxX7d4Ss3yYtYtU8lEiRg9V0mx98piIfnub0grBl5cCPuMJ1LiVnbfg+cXFlbmtkYoU+8WPjE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR10MB6608.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RirFZ8iTAa1/u0XTNVjAlhmQz7/N35zEmh9UgviMwqa34R6QblhdcgIzA5Sa?= =?us-ascii?Q?KHH3UEuTvnKaqpHY1QU8obPr31Wn1L5EOo2cHQnRSJP8I+kRBPssd0dnPFti?= =?us-ascii?Q?hm5CJLjlffd0EA6yYUZf5620PuMdy/ie44wG9Q4uM4Rh0+kmclLtGpfV31pk?= =?us-ascii?Q?wvX6WIbxVB/urSnzbohNSHUptDFDyrr1yaGWiGmC1A4TEYyLNMLrn4nq7XON?= =?us-ascii?Q?pXbn4ACwfmpkq302UkD16kB0b3jTZG8HLh+2OZIN62TKW+k4+SrnCazV4KZr?= =?us-ascii?Q?o2mDjrodGHeEXIGINZJvaEacUMasN+3vTnyUX4raoGY2mTdGI0RVQmDSLho4?= =?us-ascii?Q?wf0T4gC1jfHSulJbRO3rfyMV3cEP8MJ/BHhw+dDShUQp+3U0vF4id3MJCj+S?= =?us-ascii?Q?r/85XVTsb3k5DNQEd+h68XJyNkpXQ3QjY8BNn+Y5dbTPFEgtQslVNXDLKk30?= =?us-ascii?Q?wlBP/lXnEuzUEITClfMozYbYDhdoE7rGNWNWqntbG2+cVYwmRkuj86zlPGvA?= =?us-ascii?Q?qJgYKqIw6mo+HxXA0E0DExuhjmpe8ElBBGKddgZtn6yT5ZdarYJiOnz0pF8K?= =?us-ascii?Q?6K/UUJeNbOgekj11//E4WXDOST0IjpK3KDBbjxnSGHDlXl10zG4Vt/qo78g/?= =?us-ascii?Q?E/vJkPjTNOjzzIaxr+KDlhp4hsjbwcpo08T4x0XG7LbhtQHdFanN3J5ifBMg?= =?us-ascii?Q?I3kPBqmXphj5SqMcH1rnt3HCjqi4vmVQdNccxwr++ahp1vCFv39s3fg5Krg4?= =?us-ascii?Q?Hr+Zip44B4kd7a4WuVLjM0ZZfmBwOaERr8B6546r2arJbv/yexT7cprRHnGI?= =?us-ascii?Q?Gwf7dpXP7kISqJ69ouns0A9O9qztqawTQ/DOCQUW5y1X1DCguWhYBkGlXAmP?= =?us-ascii?Q?bhqKNYXc1BhIUtBF4u3wPoUymnhdnf1nfEIWVHbZyy1uVD9IgwA4W16VsS5L?= =?us-ascii?Q?kXps/X2Nnvv6BBtN/3vZBCMVrB9Faem6HFiRcpzs5P6EuGHBlMeyaAJgSABH?= =?us-ascii?Q?5DomUfLX2tp6pJ5KVl+FTS9GqmW8yQXBlQ/bCimp9FnOw/KVjvmp+W95Zahj?= =?us-ascii?Q?MZxqtQ24ChgRvgddQN8YTKJHXW/FulGhcc/N6qBOjNA/ra9xbUF1TnbjDSN3?= =?us-ascii?Q?E+4r1f2CV5x3AQZzGP+srjliOExVLi9J/4LBcleXw4sgxtwKWDCzb/y9Ynqe?= =?us-ascii?Q?xDRJHYEXD3QW1UbhYBx/DdvP1s4gwS2kEakh/txnLbtZ3fYbFPWd9vswZUWU?= =?us-ascii?Q?A7YstSl11V7zsgjVapdfb/GlnaZD/eFz95IsJehSZlP1P1i4KIdRA7KS2f23?= =?us-ascii?Q?0Msv3yz1aFqGLDboBcnhpulYBC6L0yLGzY2yAaGD8Qc6apfqhJQuRdeDCnpk?= =?us-ascii?Q?tJOpCFM1CM7JtDZnO+DXcE52vRHPQVT9ssg6msqNfSoAX20pfzbHh84FCQ2u?= =?us-ascii?Q?VH27IiMRk9gqtD/P9cFI0zaiJzu3pxw7kUMf+OFrOphUeNBaLX3fD2JSnTkI?= =?us-ascii?Q?e+NoZ83dQ9QMjwlzB4bT96ExOraeV0Hd7XXkDSyCRH0BXsJNgBw69402L1BA?= =?us-ascii?Q?NCbtE4lkS+22TTArIgessLAx/oBmRbbhrva4eylykKwZp4n9le4uOCKZaVAY?= =?us-ascii?Q?GQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qfx6MCVW48PxpsHcHT4omBw2flj9J2cQdd6kdcbif/QUto6d0fxvfadw8vJ1eutd6dhoI7UEiXbnIRF0PsNNux7hGpzt7oWZsit8yzHTpaWLH+DnnXlQkA4G8xqRTKXi8/KS6ltZOcMZYsTh6ozRCs7Nf7qVIWJMART2YjCLVRZGPx1YJbOqhjCq9HYOaU+MExWEilED45HqAvHYbHSR2jwND1TrRSlfWbKNvmQ9NDa43U+bo9nQOHtVBZHrc9YRnbt1JygGKy6nwb2uM556dVW2BkwLUiKTHF87bv40ZLv2n6p/mnzdGQBiISuHPPmZlHyCC21LjU9HorCQA3fFWfirBgVNE2VTDViC/dBJe2A4DpHZertduUmQI9ZfsDHf7E2ul1tHmuHls6IEB5GH779Oyj1cmQr05rtcYbvbjCdnfOg0uf6tPVrTaFeHC7wd5YFUon2VNpunWxI7gZlBxulqy5Xo23vcWI5YOYuySwqxDoOYNAR12MaJ5bJYZhgOlOD6mcZNkGtICWdi+FEud3NhiCUl1T3AcDWSxD56AyfMYnUUrDpcz6IIyHvwC/fUK9AG4E44R9aaTpXNs5bJDRQwJLSFUAiQsmeVvimRFrc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9589fd57-59b8-41f8-9dd8-08dc5f1be898 X-MS-Exchange-CrossTenant-AuthSource: MW4PR10MB6608.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2024 20:21:05.1887 (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: 0gnHMc8EEU3DX9aUDUbHt1qcS/bvDxQGEa4Z9u121xmrRnD31YUUyKenrWkfv+fzTPj+PX2ggaooFD2TxieFbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6640 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-17_17,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 mlxlogscore=989 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404170143 X-Proofpoint-ORIG-GUID: yKBQshe6Y30SQ8W6_AOcSGd_BqJY9UPD X-Proofpoint-GUID: yKBQshe6Y30SQ8W6_AOcSGd_BqJY9UPD X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 List-Id: These two fields are constantly confusing because CTF dicts contain both a symtypetab and strtab, but these fields are not that: they are the symtab and strtab from the ELF file. We have enough string tables now (internal, external, synthetic external, dynamic) that we need to at least name them better than this to avoid getting totally confused. Rename them to ctf_ext_symtab and ctf_ext_strtab. libctf/ * ctf-dump.c (ctf_dump_objts): Rename ctf_symtab -> ctf_ext_symtab. * ctf-impl.h (struct ctf_dict.ctf_symtab): Rename to... (struct ctf_dict.ctf_ext_strtab): ... this. (struct ctf_dict.ctf_strtab): Rename to... (struct ctf_dict.ctf_ext_strtab): ... this. * ctf-lookup.c (ctf_lookup_symbol_name): Adapt. (ctf_lookup_symbol_idx): Adapt. (ctf_lookup_by_sym_or_name): Adapt. * ctf-open.c (ctf_bufopen_internal): Adapt. (ctf_dict_close): Adapt. (ctf_getsymsect): Adapt. (ctf_getstrsect): Adapt. (ctf_symsect_endianness): Adapt. --- libctf/ctf-dump.c | 2 +- libctf/ctf-impl.h | 6 +++--- libctf/ctf-lookup.c | 6 +++--- libctf/ctf-open.c | 36 ++++++++++++++++++------------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index 11179a61386..474c4e00cea 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -441,7 +441,7 @@ ctf_dump_objts (ctf_dict_t *fp, ctf_dump_state_t *state, int functions) if ((functions && fp->ctf_funcidx_names) || (!functions && fp->ctf_objtidx_names)) str = str_append (str, _("Section is indexed.\n")); - else if (fp->ctf_symtab.cts_data == NULL) + else if (fp->ctf_ext_symtab.cts_data == NULL) str = str_append (str, _("No symbol table.\n")); while ((id = ctf_symbol_next (fp, &i, &name, functions)) != CTF_ERR) diff --git a/libctf/ctf-impl.h b/libctf/ctf-impl.h index b7123317c98..8ce489a55ba 100644 --- a/libctf/ctf-impl.h +++ b/libctf/ctf-impl.h @@ -366,9 +366,9 @@ struct ctf_dict struct ctf_header *ctf_header; /* The header from this CTF dict. */ unsigned char ctf_openflags; /* Flags the dict had when opened. */ ctf_sect_t ctf_data; /* CTF data from object file. */ - ctf_sect_t ctf_symtab; /* Symbol table from object file. */ - ctf_sect_t ctf_strtab; /* String table from object file. */ - int ctf_symsect_little_endian; /* Endianness of the ctf_symtab. */ + ctf_sect_t ctf_ext_symtab; /* Symbol table from object file. */ + ctf_sect_t ctf_ext_strtab; /* String table from object file. */ + int ctf_symsect_little_endian; /* Endianness of the ctf_ext_symtab. */ ctf_dynhash_t *ctf_symhash_func; /* (partial) hash, symsect name -> idx. */ ctf_dynhash_t *ctf_symhash_objt; /* ditto, for object symbols. */ size_t ctf_symhash_latest; /* Amount of symsect scanned so far. */ diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c index 1fcbebee2d1..aa251bafb89 100644 --- a/libctf/ctf-lookup.c +++ b/libctf/ctf-lookup.c @@ -469,7 +469,7 @@ ctf_symidx_sort (ctf_dict_t *fp, uint32_t *idx, size_t *nidx, static const char * ctf_lookup_symbol_name (ctf_dict_t *fp, unsigned long symidx) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_link_sym_t sym; int err; @@ -540,7 +540,7 @@ static unsigned long ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname, int try_parent, int is_function) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_link_sym_t sym; void *known_idx; int err; @@ -973,7 +973,7 @@ ctf_lookup_by_sym_or_name (ctf_dict_t *fp, unsigned long symidx, const char *symname, int try_parent, int is_function) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_id_t type = 0; int err = 0; diff --git a/libctf/ctf-open.c b/libctf/ctf-open.c index f80bf5476a7..22475465fa8 100644 --- a/libctf/ctf-open.c +++ b/libctf/ctf-open.c @@ -1626,8 +1626,8 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, if (symsect != NULL) { - memcpy (&fp->ctf_symtab, symsect, sizeof (ctf_sect_t)); - memcpy (&fp->ctf_strtab, strsect, sizeof (ctf_sect_t)); + memcpy (&fp->ctf_ext_symtab, symsect, sizeof (ctf_sect_t)); + memcpy (&fp->ctf_ext_strtab, strsect, sizeof (ctf_sect_t)); } if (fp->ctf_data.cts_name != NULL) @@ -1636,14 +1636,14 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, err = ENOMEM; goto bad; } - if (fp->ctf_symtab.cts_name != NULL) - if ((fp->ctf_symtab.cts_name = strdup (fp->ctf_symtab.cts_name)) == NULL) + if (fp->ctf_ext_symtab.cts_name != NULL) + if ((fp->ctf_ext_symtab.cts_name = strdup (fp->ctf_ext_symtab.cts_name)) == NULL) { err = ENOMEM; goto bad; } - if (fp->ctf_strtab.cts_name != NULL) - if ((fp->ctf_strtab.cts_name = strdup (fp->ctf_strtab.cts_name)) == NULL) + if (fp->ctf_ext_strtab.cts_name != NULL) + if ((fp->ctf_ext_strtab.cts_name = strdup (fp->ctf_ext_strtab.cts_name)) == NULL) { err = ENOMEM; goto bad; @@ -1651,10 +1651,10 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, if (fp->ctf_data.cts_name == NULL) fp->ctf_data.cts_name = _CTF_NULLSTR; - if (fp->ctf_symtab.cts_name == NULL) - fp->ctf_symtab.cts_name = _CTF_NULLSTR; - if (fp->ctf_strtab.cts_name == NULL) - fp->ctf_strtab.cts_name = _CTF_NULLSTR; + if (fp->ctf_ext_symtab.cts_name == NULL) + fp->ctf_ext_symtab.cts_name = _CTF_NULLSTR; + if (fp->ctf_ext_strtab.cts_name == NULL) + fp->ctf_ext_strtab.cts_name = _CTF_NULLSTR; if (strsect != NULL) { @@ -1836,11 +1836,11 @@ ctf_dict_close (ctf_dict_t *fp) if (fp->ctf_data.cts_name != _CTF_NULLSTR) free ((char *) fp->ctf_data.cts_name); - if (fp->ctf_symtab.cts_name != _CTF_NULLSTR) - free ((char *) fp->ctf_symtab.cts_name); + if (fp->ctf_ext_symtab.cts_name != _CTF_NULLSTR) + free ((char *) fp->ctf_ext_symtab.cts_name); - if (fp->ctf_strtab.cts_name != _CTF_NULLSTR) - free ((char *) fp->ctf_strtab.cts_name); + if (fp->ctf_ext_strtab.cts_name != _CTF_NULLSTR) + free ((char *) fp->ctf_ext_strtab.cts_name); else if (fp->ctf_data_mmapped) ctf_munmap (fp->ctf_data_mmapped, fp->ctf_data_mmapped_len); @@ -1909,13 +1909,13 @@ ctf_getdatasect (const ctf_dict_t *fp) ctf_sect_t ctf_getsymsect (const ctf_dict_t *fp) { - return fp->ctf_symtab; + return fp->ctf_ext_symtab; } ctf_sect_t ctf_getstrsect (const ctf_dict_t *fp) { - return fp->ctf_strtab; + return fp->ctf_ext_strtab; } /* Set the endianness of the symbol table attached to FP. */ @@ -1930,8 +1930,8 @@ ctf_symsect_endianness (ctf_dict_t *fp, int little_endian) our idea of the endianness has changed. */ if (old_endianness != fp->ctf_symsect_little_endian - && fp->ctf_sxlate != NULL && fp->ctf_symtab.cts_data != NULL) - assert (init_symtab (fp, fp->ctf_header, &fp->ctf_symtab) == 0); + && fp->ctf_sxlate != NULL && fp->ctf_ext_symtab.cts_data != NULL) + assert (init_symtab (fp, fp->ctf_header, &fp->ctf_ext_symtab) == 0); } /* Return the CTF handle for the parent CTF dict, if one exists. Otherwise -- 2.44.0.273.ge0bd14271f