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/macho/machoview.cpp | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'view/macho/machoview.cpp')

diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
index d8a8a57f..5a118256 100644
--- a/view/macho/machoview.cpp
+++ b/view/macho/machoview.cpp
@@ -2428,30 +2428,23 @@ Ref<Symbol> MachoView::DefineMachoSymbol(
 		string fullName = rawName;
 		Ref<Type> typeRef = symbolTypeRef;
 
-		QualifiedName varName;
 		if (m_arch)
 		{
-			if (IsGNU3MangledString(rawName))
+			QualifiedName demangledName;
+			Ref<Type> demangledType;
+			bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
+			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
 			{
-				Ref<Type> demangledType;
-				if (DemangleGNU3(m_arch, rawName, demangledType, varName, m_simplifyTemplates))
-				{
-					shortName = varName.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());
-				}
+				shortName = demangledName.GetString();
+				fullName = shortName;
+				if (demangledType)
+					fullName += demangledType->GetStringAfterName();
+				if (!typeRef && m_extractMangledTypes && !GetDefaultPlatform()->GetFunctionByName(rawName))
+					typeRef = demangledType;
+			}
+			else
+			{
+				m_logger->LogDebug("Failed to demangle name: '%s'\n", rawName.c_str());
 			}
 		}
 
-- 
cgit v1.3.1