From patchwork Thu Oct 10 21:51:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Mezentsev X-Patchwork-Id: 98695 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABEB4385AC22 for ; Thu, 10 Oct 2024 21:51:57 +0000 (GMT) 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 80C613858D37 for ; Thu, 10 Oct 2024 21:51:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 80C613858D37 Authentication-Results: sourceware.org; dmarc=pass (p=reject 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 80C613858D37 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=1728597092; cv=pass; b=Pb10oARs6G8t4CisZL6L68ejb3QFXHCFje2GPd+Bc+t+nKLFGLYUP/kJD0+PomGCY/zjt8qFPlp1RE0BB65HDksVtpW2JN65974w8VYbFpUceMzJdvZsuoWixoRqggRohxFE9MneGCV+D/0yU2k0gaMu72sUq6JlWlkw0PCgpSs= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1728597092; c=relaxed/simple; bh=RK478OR91ddkLNmKpfK0cfvgx1nLeqkcM1bB/aiW2Lk=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=HKULahW7HfFWW/B9izI7cGoDCFDeL18rvphHKY4E2hBKOfhep3yu0/7n2T4F7pfDPx6dHwbNMSaJCt47tz/KwVXhTSc3UR9m4yJeW3UvVV7vU3L4L2iVJqlUpkJYhophKESRTKUYEWO+orrTg+cLgulW45AoD6aKSfw36x9mbkE= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49AJtdQD010777 for ; Thu, 10 Oct 2024 21:51:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=corp-2023-11-20; bh=49RG6alMAsW0ykR0 0XMMangrjF0v0b0gZuJxxiglxgs=; b=D+ABpVFkDqoyo9ttr90ralLHe7M6GevG MPsPeHa6He0e1i+c8iJ6AM8i3S/XQVbsM7yjX2cjsby0rPoZCCjv8zuqVXtIWCGQ 9h1ztjsmFeLqqrXLxJQBBcp2bg6cscEnRa6WIhngyPisfc0T0SVkjK816nlyWHLC UrALCuWLsBSBNik5i7VvSc7JsRW+ngUJrPua7LF0Mw5qaMhIQyXjXHC0d2pZPdnu EZ6WeawLrggr9gIbiNC3xmB6dy1rheILxWoewBiiKUrvAyc2HLL3ykXMAB3pc+1R LDJE7CBmi/CDYJzcZ0zCzHmWsA/6OMC00lgvUIEtqWMTIi/M9MPu1w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 42303yksjk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Oct 2024 21:51:29 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 49AKsjZP034343 for ; Thu, 10 Oct 2024 21:51:28 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 422uwamtsv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Oct 2024 21:51:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lr/zBkkyRztx6HgeuupVR/7izrBQzOuZ2yyzieA5xiCbpptbIjYjyYdTwV2s5ZQyVgkqFmooogJOyfUKhalB72Fnldvy3zQC3w7tlDAq/us4m5GMXL85X7j1sgXwXL3xG5mO8fL1YgWTqhZ1KjizQxIKf1qB5su+9OxkSDfZGBUgcvISPDzY2IkRl2+Lq+X0xuKwC6LTr6mMD4Jn9oFHcfeN3xKOu3vahWlUV4dxN9tgjHCUE1dgA4SV1AdP5E/o7vN9YYngEl567FOBKIQ8JIO/Gxjn1QmAtBx+00pz3qYULnK6SuprRnyh9/KhPbApNAnTM5reOe6+1V1r5pD/Ig== 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=49RG6alMAsW0ykR00XMMangrjF0v0b0gZuJxxiglxgs=; b=AhAdDr0cZMqF2KTuVegIZEPB4m+eBoXORzeT8PefuZu649VyboBeG29glPSdd43WShSlcUYYad6Sz5QWAyV5KSFMVSP8J2JZPDldqwHbxPh3100Hd6Ya/GPYqJdWmen2Cq8EsUJ/mIiSEKG2CrA02WCmRI9K8eOufqbQOje/5AitWMDelHVXwnNt65gBQui8zfBE+juGKO7MUFHuXRLmQRoLAItAHQsrtStVX3PpedhNWD+B1N/Ln5mm/dZi5F6JyPEtMjIbk4M7S2t4vEfcTmD7XLQNXofXQnqvpBZiI2/xkFV2anHSptNSoyBV48LCeB7lTRd+6cjqQSZLEydemQ== 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=49RG6alMAsW0ykR00XMMangrjF0v0b0gZuJxxiglxgs=; b=0IGxfmV4rcUIzZrW6nOfEv5AA9/6sljy+9F3YzHHX4lLZmiGFGOgE0F2P7pyq0+9a6y9C5b+MOF4kwWKuRHVGIsuUD+D/rwmu9yxroj3WmcYqAy1uf5rISSGthubR71TseyaUFMXzPA//XgdaCGNnlrM5m4WsH2WPMTtMO59Lgs= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by PH0PR10MB4485.namprd10.prod.outlook.com (2603:10b6:510:41::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Thu, 10 Oct 2024 21:51:25 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::1b3d:bd64:9100:c3fb]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::1b3d:bd64:9100:c3fb%7]) with mapi id 15.20.8048.017; Thu, 10 Oct 2024 21:51:25 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] Fix 32110 gprofng segfaults on parsing DWARF of clang++ 18.1.3 produced binary Date: Thu, 10 Oct 2024 14:51:17 -0700 Message-ID: <20241010215117.1332968-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.43.5 X-ClientProxiedBy: MN2PR19CA0062.namprd19.prod.outlook.com (2603:10b6:208:19b::39) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|PH0PR10MB4485:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fbde08a-4abb-40b3-e49f-08dce975afbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: d4g91XBP/UWGPTiBoc9fy15zXg2C04ylTfpergo6zi26LyYMQQlaEOl8YSkSpeFXFQktIWP5iPDHRPux0Z7LO2fcKQfO2BrB1O1mAG2b3dDRwX3AY/1h5t4hSOtkHWyO29rHSBtioMQB7JmKFb0/oT9Wo8is0pQpaphceM2mHrrip713Zegv8vOoLW0TvqDjaZdeqEeoY8diBKVlwi1zOCgWWPdH70sWsv40rw8N8QbkE4v/MPjFqDauHDCdYZJnmAozLptmrMFs8DLPq0yRy2ySOZoiC+ck5u+73tS216gRqt8Y22MTOb3LL95nDvRx0/axJDOMSE8LvwCuVY4SU7jnS0WDyTvTG06afYAMJZ/iz/HXGXC+HkfYGHUFUicMBmKpdEsZbSyINnMDjW4GkieV2DHkaAjU00M6ExrFrz2eGMYEzD4bdrlfa3V0QQ9nu0qdT0KgufISb95dkwRA8fCoBHVOjj5usSumlR7HCf2z1Is4r0MxWsh7CzfZvseAS1Lwm6HezhguBLxl46UKQ4yBH+cPF3WUQBWmpWkkVja4m/8OBwb6t83cAnwF8xQYwx49QCWTrqvlc2Sy2WxrWU4PBZvBwGNzUY4NqjsbnACKJBrpYl1bnQwjvF0lO7r6EWZFiPSgBdWA98SqvKbGtf1WgWuclXyt2gzqnOGSUIXnWZfKP3BkAj7BOcAY0U/8e3dU/ve+Zl3VtOil1CELD09zy1kSBV4yq6B7XZm27HAHMU4yUtVR/zWeutkAJZfKPKy4dtan6HwU2GD32De05juxlxwMsImCpGHm7cUaYikwvWFmtgwl2lVUF0Qt1MISf3P7r89wHyZAiBe3nKqEUn2vApoy2i5ZKVvzaYaV2jq6TuqEmVyOVqoPptAB7H82XPkv8hEqvZ21rpf64ZCykN/7EKfCDbETiO8gc1C8wYUUSaIlhGfxaQvRTC82OX/vbEZbwYaJQ9dFxJc8nZmLE95l653/PCRxcbaiThgwvUIxWK5WR2Z3W6lh0o+RsYW7+LWbhr82hiMgl0fP1EiXfnbliXvPs64TBGIgSoHOnvs84tyqdHngrRbTNKVSr2e7ba16FH6aV16rgUvyYlQ4S/jJ/cMtfT69GD5iZJJA5ZraYMVsLrd7t9sUgkMLKouiFS2goJxXAzf6Zf03jiyVXoXlKHOWEPfeBJsmEjYc0UhJmqtGJhPbKm6KQLqVOth7C4WnvvNPXz8S7G+Cjvq1VJSKtp0UZqErOI5j87d4PMKqAW01w1YSk60ZlP1KbPHmwlgJscW7MBu7FDQ+i+QOOA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4636.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y+1/iT6loH8ACjgi0cGDv/hcXI7tquoR9tA3oXPlN4rhj4uDXQL06qLWNYxj5Yiek9lLSeH4yGPuGbangOBN13vVQ0h0LeE7LPMyzgk7AmaAO5l4tVDvXxgNLs+HBXRtTwviNl1BBQYsiZxrDvez7QdyqX2evcNTV5NP9Lj0mBMnTVEuMwyFePZKXGoQMzzXSRFJyBuO1+mAjmhSFVlm1H7n/PsmOVTQYdiYR294dUHURc9MV8aGa0C2awqTFnzAVsUn4iCzGcSIM1fJUdKs4vKoulLAdOPPK/h1PjB6xTdxFfjSioR1Mr5vZ1p/X9R4EfGA34jhhnJEnYC7bvquLiid5YrMBNM4KmIV97HSsCVmes9Mrwygn65EPKI/tre9v3wD4txqPBHMBCaENRYT1KOCC39jT64Cm1/GoY/WJb6DeI1xENLMZ0LeIrhwYeKGUMdpqbhgukr/VQBlMFA5WhekkYY8HU50aHdsjM/Ud/x02nQCY+hk0JkHzWPazsW+psl3CJo8QyuM3xVmFTHfWWKwQAH8j1Z4SjVuDr6VkPOZ0kPScMZ+eXG3BrAzG8POHYbUL2+YoLsVJBfsS+DRCBwt1BaatAbF6khHMxDSS02t/brB5IJmFhSW4XUUoj7UJ+ZYOomJ+lMQSqNv+kmU9MKqQZgA4C6VqnU3hheTxj9964KkLda267iwOysPJch14B5kl3bFdGhBgoCvdWAzjYKruUQlDdTExWXjfXKIXvxMLKUjODzouYBskGmbiPEHJ8Hv3aTe0nvTNyM6nvr4DMdBJkpYu3FIbvtzZzRiaLa1Oyu8c3FnhQpReVmth7spOGgY2EMMNDg4TB6AwCZM/SAutXU1iWCJNKjAkvo+6s+n9Si08ukwdbBtQCa5M+mt4AvrwR6cFl+CodrPnEpMNTfoh2BjhPQeSSfCWD3sTU0Us3jm5v0o7kaYmDOPLDwRvHHhOqOyXVyhwXvhbzPmFvFmNzNtjZzu7gLpC9BBZdw+1IiwkqNiMu/VNzQEBNtWrAYZkUzmDtPIkAaO+xAq1gjHkZdAFSjU6PydBk/YAs8RJ4aWpr+up6p1PRSLhRO0/CC+UG+JfR5hqb5Kq3K7cAI5BO/Uj+Mi1QcLY+k7k/D6/4vuwmoxBY/+5+TcGTx0wvebrzC08hdc+Z0/a/s6JQnLP4nVtc+af9ciHddT2ETRZYYKIEOXw7t5qDEBb+t5x+B2fWVMZ3oRphLel3r7m77csaH03G2vnjMXBRmNmSwC86NMyNDIpemND1e8jAguTlZYhzM0lut8/QCOdqs+dSEZXZIX9tCErl5LRnobPAO99VQxVtW4q+MoMHLqeZh5lTsfBqUGmMj3qAONLiNImwipYjJNaT/1Uk+jiCPv4OPuLZAsGkfYCnqoyvvj8Yuh5dNOWgrSiBWt42pG/wBO+7aVqa7e053cpYyD7QBp5IW9QwdkdRTGg4qoAtDR44R6nnD4aThdeMQCoB6H36f6daFu2saY5/JEkgku+TgKdXz5Ju1oymJnEPRpxFuoUlfKLa6UWpDMuufhJvXgPk/uM7cV98XyWl+TdLOKBVnIe+Qg59rcbBzo7NSdv2hQiNZ2En0xJmhm5pLzenO3YidaMYaogItcOjPg5yC1VKeiYfP5qq/fBQ5Bzwvz7IbaJO2d X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hGgUQW83PujKVKlJ2vXj/DCPQcbyO17bqGS8No6aRLje08sJwV1ZmuCFhqJ6IBbpNihytNK35Ch9a1YqfE+4J58IK/4JtUgNxqTWVoftWGtSDWqSVleHXa0tgKjZgfQVrnTsBkcxZilAs8XfYgm1j9pvIS2HW76DZ3F/0Ql3wHQl1WgvLTB+kkDwJAy/kFCWQMSisBP7URO4jje1DV072n5Qyo7z9J1tn1Vc+Y/Zklq7YVFM+mkOf1Klft50TGbFw9tFYBMO476Nx44MjIrYUdaP0mjGRR+bXN6iqq3//ClOF8Yu6Z1tvIttJ9fPK21nN6lUbbgYwPeopFeTQBDtneHO+azt9YweEQ7cgxVoZItTmW60CknYYZOQ6YM2zD/Ks4CKRcFRrRlGASppX7BGSHSiToecjZO9IlFbkQDMSP6oMsT8Kfj5lPP1gKJu0+KUVpe/YpZDlRKJs8tQSGlTTcWhdr0EyxMJM9J5eq+jIbTdGGWQR1/pwnOC46LO1LzK5CaCBvPyLxPVtCf/TzumU0DUWNZX0ic5nx38QbiJj8ntQzYZ3OB2uockWGOQEM5i33t2syO6akLAZsSR9R0v3xzNuiubbtH3rGYZFYSNFlQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fbde08a-4abb-40b3-e49f-08dce975afbd X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2024 21:51:25.0421 (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: 0XkgxKq6/jQ00XgSdNchxIljZUpuHKrmyBHWfMWMe9O12xBamWa9OZrKtPtY7nFP+H3bG99Gzv9X4HporIubUB/ibgNePrPNOJHH4WNBi4Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4485 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-10_16,2024-10-10_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 mlxscore=0 suspectscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410100144 X-Proofpoint-ORIG-GUID: D98rIbmILrw5s7582xYYrsLmrgmpEYQI X-Proofpoint-GUID: D98rIbmILrw5s7582xYYrsLmrgmpEYQI X-Spam-Status: No, score=-13.0 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_H3, 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 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: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org From: Vladimir Mezentsev gprofng does not handle DW_FORM_strx1* forms correctly. gprofng/ChangeLog 2024-10-10 Vladimir Mezentsev PR 32110 * src/DwarfLib.cc: Handle DW_FORM_strx* forms. --- gprofng/src/DwarfLib.cc | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/gprofng/src/DwarfLib.cc b/gprofng/src/DwarfLib.cc index 18c47a4ee95..a150c76cdd5 100644 --- a/gprofng/src/DwarfLib.cc +++ b/gprofng/src/DwarfLib.cc @@ -1006,6 +1006,10 @@ Dwr_Tag::dump () case DW_FORM_string: case DW_FORM_line_strp: case DW_FORM_strp_sup: + case DW_FORM_strx1: + case DW_FORM_strx2: + case DW_FORM_strx3: + case DW_FORM_strx4: case DW_FORM_implicit_const: Dprintf (DUMP_DWARFLIB, " \"%s\"", atrp->u.str ? atrp->u.str : ""); break; @@ -1018,6 +1022,15 @@ Dwr_Tag::dump () atrp->u.str); break; case DW_FORM_addr: + case DW_FORM_addrx: + case DW_FORM_addrx1: + case DW_FORM_addrx2: + case DW_FORM_addrx3: + case DW_FORM_addrx4: + case DW_FORM_ref_sup4: + case DW_FORM_ref_sup8: + case DW_FORM_loclistx: + case DW_FORM_rnglistx: case DW_FORM_data2: case DW_FORM_data4: case DW_FORM_data8: @@ -2058,25 +2071,40 @@ DwrCU::set_die (Dwarf_Die die) (void) debug_infoSec->Get_64 (); break; case DW_FORM_addrx: - case DW_FORM_strx: case DW_FORM_loclistx: case DW_FORM_rnglistx: atf->u.offset = debug_infoSec->GetULEB128 (); break; - case DW_FORM_addrx1: + case DW_FORM_strx: + atf->u.offset = debug_infoSec->GetULEB128 (); + atf->u.str = get_string (dwarf->debug_strSec, atf->u.offset); + break; case DW_FORM_strx1: atf->u.offset = debug_infoSec->Get_8 (); + atf->u.str = get_string (dwarf->debug_strSec, atf->u.offset); break; - case DW_FORM_addrx2: case DW_FORM_strx2: atf->u.offset = debug_infoSec->Get_16 (); + atf->u.str = get_string (dwarf->debug_strSec, atf->u.offset); break; - case DW_FORM_addrx3: case DW_FORM_strx3: atf->u.offset = debug_infoSec->Get_24 (); + atf->u.str = get_string (dwarf->debug_strSec, atf->u.offset); break; - case DW_FORM_addrx4: case DW_FORM_strx4: + atf->u.offset = debug_infoSec->Get_32 (); + atf->u.str = get_string (dwarf->debug_strSec, atf->u.offset); + break; + case DW_FORM_addrx1: + atf->u.offset = debug_infoSec->Get_8 (); + break; + case DW_FORM_addrx2: + atf->u.offset = debug_infoSec->Get_16 (); + break; + case DW_FORM_addrx3: + atf->u.offset = debug_infoSec->Get_24 (); + break; + case DW_FORM_addrx4: case DW_FORM_ref_sup4: atf->u.offset = debug_infoSec->Get_32 (); break;