Make template simplification demangler-controlled and expand structured template simplifier coverage

Author: plafosse

binaryninjaapi.h

@@ -2542,26 +2542,6 @@ namespace BinaryNinja {
 	*/
 	bool IsGNU3MangledString(const std::string& mangledName);
 
-	/*!
-		\ingroup demangle
-	*/
-	std::string SimplifyToString(const std::string& input);
-
-	/*!
-		\ingroup demangle
-	*/
-	std::string SimplifyToString(const QualifiedName& input);
-
-	/*!
-		\ingroup demangle
-	*/
-	QualifiedName SimplifyToQualifiedName(const std::string& input, bool simplify);
-
-	/*!
-		\ingroup demangle
-	*/
-	QualifiedName SimplifyToQualifiedName(const QualifiedName& input);
-
 	/*!
 		\ingroup mainthread
 	*/
@@ -20477,38 +20457,6 @@ namespace BinaryNinja {
 		static int Compare(LinearViewCursor* a, LinearViewCursor* b);
 	};
 
-	/*!
-
-		\ingroup simplifyname
-	*/
-	class SimplifyName
-	{
-	  public:
-		// Use these functions to interface with the simplifier
-		static std::string to_string(const std::string& input);
-		static std::string to_string(const QualifiedName& input);
-		static QualifiedName to_qualified_name(const std::string& input, bool simplify);
-		static QualifiedName to_qualified_name(const QualifiedName& input);
-
-		// Below is everything for the above APIs to work
-		enum SimplifierDest
-		{
-			str,
-			fqn
-		};
-
-		SimplifyName(const std::string&, const SimplifierDest, const bool);
-		~SimplifyName();
-
-		operator std::string() const;
-		operator QualifiedName();
-
-	  private:
-		const char* m_rust_string;
-		const char** m_rust_array;
-		uint64_t m_length;
-	};
-
 	struct FindParameters
 	{
 		BNFindType type;
@@ -22294,7 +22242,7 @@ namespace BinaryNinja {
 
 		static bool IsMangledStringCallback(void* ctxt, const char* name);
 		static bool DemangleCallback(void* ctxt, BNArchitecture* arch, const char* name, BNType** outType,
-			BNQualifiedName* outVarName, BNBinaryView* view);
+			BNQualifiedName* outVarName, BNBinaryView* view, bool simplify);
 		static void FreeVarNameCallback(void* ctxt, BNQualifiedName* name);
 
 	public:
@@ -22355,7 +22303,7 @@ namespace BinaryNinja {
 			\return True if demangling was successful and results were stored into out-parameters
 		 */
 		virtual bool Demangle(Ref<Architecture> arch, const std::string& name, Ref<Type>& outType,
-			QualifiedName& outVarName, Ref<BinaryView> view = nullptr) = 0;
+			QualifiedName& outVarName, Ref<BinaryView> view = nullptr, bool simplify = false) = 0;
 	};
 
 	/*!
@@ -22369,7 +22317,7 @@ namespace BinaryNinja {
 
 		virtual bool IsMangledString(const std::string& name);
 		virtual bool Demangle(Ref<Architecture> arch, const std::string& name, Ref<Type>& outType,
-			QualifiedName& outVarName, Ref<BinaryView> view);
+			QualifiedName& outVarName, Ref<BinaryView> view, bool simplify = false);
 	};
 
 	namespace Unicode

binaryninjacore.h

@@ -3819,7 +3819,7 @@ extern "C"
 		void* context;
 		bool (*isMangledString)(void* ctxt, const char* name);
 		bool (*demangle)(void* ctxt, BNArchitecture* arch, const char* name, BNType** outType,
-			BNQualifiedName* outVarName, BNBinaryView* view);
+			BNQualifiedName* outVarName, BNBinaryView* view, bool simplify);
 		void (*freeVarName)(void* ctxt, BNQualifiedName* name);
 	} BNDemanglerCallbacks;
 
@@ -8163,6 +8163,8 @@ extern "C"
 	BINARYNINJACOREAPI void BNPromoteDemangler(BNDemangler* demangler);
 
 	BINARYNINJACOREAPI bool BNIsDemanglerMangledName(BNDemangler* demangler, const char* name);
+	BINARYNINJACOREAPI bool BNDemanglerDemangleWithOptions(BNDemangler* demangler, BNArchitecture* arch,
+	    const char* name, BNType** outType, BNQualifiedName* outVarName, BNBinaryView* view, bool simplify);
 	BINARYNINJACOREAPI bool BNDemanglerDemangle(BNDemangler* demangler, BNArchitecture* arch, const char* name,
 	    BNType** outType, BNQualifiedName* outVarName, BNBinaryView* view);
 	BINARYNINJACOREAPI bool BNDemangleGeneric(BNArchitecture* arch, const char* name,
@@ -8527,9 +8529,6 @@ extern "C"
 
 	BINARYNINJACOREAPI uint32_t BNGetAddressRenderedWidth(uint64_t addr);
 
-	BINARYNINJACOREAPI BNQualifiedName BNRustSimplifyStrToFQN(const char* const, bool);
-	BINARYNINJACOREAPI char* BNRustSimplifyStrToStr(const char* const);
-
 	BINARYNINJACOREAPI BNDebugInfoParser* BNRegisterDebugInfoParser(const char* name,
 		bool (*isValid)(void*, BNBinaryView*),
 		bool (*parseInfo)(void*, BNDebugInfo*, BNBinaryView*, BNBinaryView*, BNProgressFunction, void*),

demangle.cpp

@@ -111,35 +111,6 @@ namespace BinaryNinja {
 	}
 
 
-	string SimplifyToString(const string& input)
-	{
-		return BNRustSimplifyStrToStr(input.c_str());
-	}
-
-
-	string SimplifyToString(const QualifiedName& input)
-	{
-		return BNRustSimplifyStrToStr(input.GetString().c_str());
-	}
-
-
-	QualifiedName SimplifyToQualifiedName(const string& input, bool simplify)
-	{
-		BNQualifiedName name = BNRustSimplifyStrToFQN(input.c_str(), simplify);
-		QualifiedName result = QualifiedName::FromAPIObject(&name);
-		BNFreeQualifiedName(&name);
-		return result;
-	}
-
-
-	QualifiedName SimplifyToQualifiedName(const QualifiedName& input)
-	{
-		BNQualifiedName name = BNRustSimplifyStrToFQN(input.GetString().c_str(), true);
-		QualifiedName result = QualifiedName::FromAPIObject(&name);
-		BNFreeQualifiedName(&name);
-		return result;
-	}
-
 	Demangler::Demangler(const std::string& name): m_nameForRegister(name)
 	{
 	}
@@ -156,7 +127,7 @@ namespace BinaryNinja {
 	}
 
 	bool Demangler::DemangleCallback(void* ctxt, BNArchitecture* arch, const char* name, BNType** outType,
-	                                 BNQualifiedName* outVarName, BNBinaryView* view)
+	                                 BNQualifiedName* outVarName, BNBinaryView* view, bool simplify)
 	{
 		Demangler* demangler = (Demangler*)ctxt;
 
@@ -165,7 +136,7 @@ namespace BinaryNinja {
 
 		Ref<Type> apiType;
 		QualifiedName apiVarName;
-		bool success = demangler->Demangle(apiArch, name, apiType, apiVarName, apiView);
+		bool success = demangler->Demangle(apiArch, name, apiType, apiVarName, apiView, simplify);
 		if (!success)
 			return false;
 
@@ -240,12 +211,12 @@ namespace BinaryNinja {
 	}
 
 	bool CoreDemangler::Demangle(Ref<Architecture> arch, const std::string& name, Ref<Type>& outType,
-		QualifiedName& outVarName, Ref<BinaryView> view)
+		QualifiedName& outVarName, Ref<BinaryView> view, bool simplify)
 	{
 		BNType* apiType;
 		BNQualifiedName apiVarName;
-		bool success = BNDemanglerDemangle(
-			m_object, arch->m_object, name.c_str(), &apiType, &apiVarName, view ? view->m_object : nullptr);
+		bool success = BNDemanglerDemangleWithOptions(
+			m_object, arch->m_object, name.c_str(), &apiType, &apiVarName, view ? view->m_object : nullptr, simplify);
 
 		if (!success)
 			return false;