From 8149774201203326096099394434871992996628 Mon Sep 17 00:00:00 2001
From: Glenn Smith <glenn@vector35.com>
Date: Mon, 23 Sep 2024 17:15:17 -0400
Subject: Demangler plugin API

Closes #467
---
 view/elf/elfview.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'view/elf/elfview.cpp')

diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp
index b90b18a7..e788b06d 100644
--- a/view/elf/elfview.cpp
+++ b/view/elf/elfview.cpp
@@ -2443,28 +2443,20 @@ void ElfView::DefineElfSymbol(BNSymbolType type, const string& incomingName, uin
 		string shortName = rawName;
 		string fullName = rawName;
 		Ref<Type> typeRef = symbolTypeRef;
-		if (m_arch && IsGNU3MangledString(rawName))
+		if (m_arch)
 		{
-			QualifiedName varName;
+			QualifiedName demangledName;
 			Ref<Type> demangledType;
-			if (DemangleGNU3(m_arch, rawName, demangledType, varName, m_simplifyTemplates))
+			bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
+			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
 			{
-				shortName = varName.GetString();
+				shortName = demangledName.GetString();
 				fullName = shortName;
 				if (demangledType)
 					fullName += demangledType->GetStringAfterName();
 				if (!typeRef && m_extractMangledTypes && !GetDefaultPlatform()->GetFunctionByName(rawName))
 					typeRef = demangledType;
 			}
-			else if (!m_extractMangledTypes && DemangleLLVM(rawName, varName, m_simplifyTemplates))
-			{
-				shortName = varName.GetString();
-				fullName = shortName;
-			}
-			else
-			{
-				m_logger->LogDebug("Failed to demangle name: '%s'\n", rawName.c_str());
-			}
 		}
 
 		if (!typeRef && (size > 0 && size <= 8))
-- 
cgit v1.3.1