Revert "Add line formatter API and a generic line formatter plugin"

This reverts commit 1699c71.

Author: D0ntPanic

basicblock.cpp

@@ -36,24 +36,6 @@ DisassemblySettings::DisassemblySettings(BNDisassemblySettings* settings)
 }
 
 
-Ref<DisassemblySettings> DisassemblySettings::GetDefaultSettings()
-{
-	return new DisassemblySettings(BNDefaultDisassemblySettings());
-}
-
-
-Ref<DisassemblySettings> DisassemblySettings::GetDefaultGraphSettings()
-{
-	return new DisassemblySettings(BNDefaultGraphDisassemblySettings());
-}
-
-
-Ref<DisassemblySettings> DisassemblySettings::GetDefaultLinearSettings()
-{
-	return new DisassemblySettings(BNDefaultLinearDisassemblySettings());
-}
-
-
 DisassemblySettings* DisassemblySettings::Duplicate()
 {
 	return new DisassemblySettings(BNDuplicateDisassemblySettings(m_object));

binaryninjaapi.h

@@ -10171,10 +10171,6 @@ namespace BinaryNinja {
 		DisassemblySettings(BNDisassemblySettings* settings);
 		DisassemblySettings* Duplicate();
 
-		static Ref<DisassemblySettings> GetDefaultSettings();
-		static Ref<DisassemblySettings> GetDefaultGraphSettings();
-		static Ref<DisassemblySettings> GetDefaultLinearSettings();
-
 		bool IsOptionSet(BNDisassemblyOption option) const;
 		void SetOption(BNDisassemblyOption option, bool state = true);
 
@@ -13698,82 +13694,6 @@ namespace BinaryNinja {
 		std::set<SSAVariable> GetSSAVariables();
 	};
 
-	struct LineFormatterSettings
-	{
-		Ref<HighLevelILFunction> highLevelIL;
-		size_t desiredLineLength;
-		size_t minimumContentLength;
-		size_t tabWidth;
-		std::string languageName;
-		std::string commentStartString;
-		std::string commentEndString;
-		std::string annotationStartString;
-		std::string annotationEndString;
-
-		/*! Gets the default line formatter settings for High Level IL code.
-
-		    \param settings The settings for reformatting.
-		    \param func High Level IL function to be reformatted.
-		    \return Settings for reformatting.
-		*/
-		static LineFormatterSettings GetDefault(DisassemblySettings* settings, HighLevelILFunction* func);
-
-		/*! Gets the default line formatter settings for a language representation function.
-
-		    \param settings The settings for reformatting.
-		    \param func Language representation function to be reformatted.
-		    \return Settings for reformatting.
-		*/
-		static LineFormatterSettings GetLanguageRepresentationSettings(
-			DisassemblySettings* settings, LanguageRepresentationFunction* func);
-
-		static LineFormatterSettings FromAPIObject(const BNLineFormatterSettings* settings);
-		BNLineFormatterSettings ToAPIObject() const;
-	};
-
-	class LineFormatter : public StaticCoreRefCountObject<BNLineFormatter>
-	{
-		std::string m_nameForRegister;
-
-		static BNDisassemblyTextLine* FormatLinesCallback(void* ctxt, BNDisassemblyTextLine* inLines, size_t inCount,
-			const BNLineFormatterSettings* settings, size_t* outCount);
-		static void FreeLinesCallback(void* ctxt, BNDisassemblyTextLine* lines, size_t count);
-
-	public:
-		LineFormatter(const std::string& name);
-		LineFormatter(BNLineFormatter* formatter);
-
-		/*! Registers the line formatter.
-
-		    \param formatter The line formatter to register.
-		*/
-		static void Register(LineFormatter* formatter);
-
-		static std::vector<Ref<LineFormatter>> GetList();
-		static Ref<LineFormatter> GetByName(const std::string& name);
-		static Ref<LineFormatter> GetDefault();
-
-		/*! Reformats the given list of lines. Returns a new list of lines containing the reformatted code.
-
-		    \param lines The lines to reformat.
-		    \param settings The settings for reformatting.
-		    \return A new list of reformatted lines.
-		*/
-		virtual std::vector<DisassemblyTextLine> FormatLines(
-			const std::vector<DisassemblyTextLine>& lines, const LineFormatterSettings& settings) = 0;
-	};
-
-	class CoreLineFormatter : public LineFormatter
-	{
-	public:
-		CoreLineFormatter(BNLineFormatter* formatter);
-
-		std::vector<DisassemblyTextLine> FormatLines(
-			const std::vector<DisassemblyTextLine>& lines, const LineFormatterSettings& settings) override;
-	};
-
-	class LanguageRepresentationFunctionType;
-
 	/*! LanguageRepresentationFunction represents a single function in a registered high level language.
 
 	    \ingroup highlevelil
@@ -13783,8 +13703,7 @@ namespace BinaryNinja {
 	        BNFreeLanguageRepresentationFunction>
 	{
 	public:
-		LanguageRepresentationFunction(LanguageRepresentationFunctionType* type, Architecture* arch, Function* func,
-			HighLevelILFunction* highLevelIL);
+		LanguageRepresentationFunction(Architecture* arch, Function* func, HighLevelILFunction* highLevelIL);
 		LanguageRepresentationFunction(BNLanguageRepresentationFunction* func);
 
 		/*! Gets the lines of tokens for a given High Level IL instruction.
@@ -13823,7 +13742,6 @@ namespace BinaryNinja {
 		*/
 		BNHighlightColor GetHighlight(BasicBlock* block);
 
-		Ref<LanguageRepresentationFunctionType> GetLanguage() const;
 		Ref<Architecture> GetArchitecture() const;
 		Ref<Function> GetFunction() const;
 		Ref<HighLevelILFunction> GetHighLevelILFunction() const;
@@ -13972,13 +13890,6 @@ namespace BinaryNinja {
 		*/
 		virtual Ref<TypeParser> GetTypeParser() { return nullptr; }
 
-		/*! Returns the line formatter for formatting code in this language. If NULL is returned, the default
-		    formatter will be used.
-
-		    \return The optional formatter for formatting code in this language.
-		*/
-		virtual Ref<LineFormatter> GetLineFormatter() { return nullptr; }
-
 		/*! Returns a list of lines representing a function prototype in this language. If no lines are returned, the
 		    default C-style prototype will be used.
 
@@ -14005,7 +13916,6 @@ namespace BinaryNinja {
 		static bool IsValidCallback(void* ctxt, BNBinaryView* view);
 		static BNTypePrinter* GetTypePrinterCallback(void* ctxt);
 		static BNTypeParser* GetTypeParserCallback(void* ctxt);
-		static BNLineFormatter* GetLineFormatterCallback(void* ctxt);
 		static BNDisassemblyTextLine* GetFunctionTypeTokensCallback(
 			void* ctxt, BNFunction* func, BNDisassemblySettings* settings, size_t* count);
 		static void FreeLinesCallback(void* ctxt, BNDisassemblyTextLine* lines, size_t count);
@@ -14020,7 +13930,6 @@ namespace BinaryNinja {
 		bool IsValid(BinaryView* view) override;
 		Ref<TypePrinter> GetTypePrinter() override;
 		Ref<TypeParser> GetTypeParser() override;
-		Ref<LineFormatter> GetLineFormatter() override;
 		std::vector<DisassemblyTextLine> GetFunctionTypeTokens(
 			Function* func, DisassemblySettings* settings = nullptr) override;
 	};

binaryninjacore.h

@@ -37,14 +37,14 @@
 // Current ABI version for linking to the core. This is incremented any time
 // there are changes to the API that affect linking, including new functions,
 // new types, or modifications to existing functions or types.
-#define BN_CURRENT_CORE_ABI_VERSION 89
+#define BN_CURRENT_CORE_ABI_VERSION 88
 
 // Minimum ABI version that is supported for loading of plugins. Plugins that
 // are linked to an ABI version less than this will not be able to load and
 // will require rebuilding. The minimum version is increased when there are
 // incompatible changes that break binary compatibility, such as changes to
 // existing types or functions.
-#define BN_MINIMUM_CORE_ABI_VERSION 89
+#define BN_MINIMUM_CORE_ABI_VERSION 86
 
 #ifdef __GNUC__
 	#ifdef BINARYNINJACORE_LIBRARY
@@ -302,7 +302,6 @@ extern "C"
 	typedef struct BNDemangler BNDemangler;
 	typedef struct BNFirmwareNinja BNFirmwareNinja;
 	typedef struct BNFirmwareNinjaReferenceNode BNFirmwareNinjaReferenceNode;
-	typedef struct BNLineFormatter BNLineFormatter;
 
 	//! Console log levels
 	typedef enum BNLogLevel
@@ -728,7 +727,6 @@ extern "C"
 		HighLevelILLinearDisassembly = 65,
 		WaitForIL = 66,
 		IndentHLILBody = 67,
-		DisableLineFormatting = 68,
 
 		// Debugging options
 		ShowFlagUsage = 128,
@@ -3441,7 +3439,6 @@ extern "C"
 		bool (*isValid)(void* ctxt, BNBinaryView* view);
 		BNTypePrinter* (*getTypePrinter)(void* ctxt);
 		BNTypeParser* (*getTypeParser)(void* ctxt);
-		BNLineFormatter* (*getLineFormatter)(void* ctxt);
 		BNDisassemblyTextLine* (*getFunctionTypeTokens)(
 			void* ctxt, BNFunction* func, BNDisassemblySettings* settings, size_t* count);
 		void (*freeLines)(void* ctxt, BNDisassemblyTextLine* lines, size_t count);
@@ -3541,28 +3538,6 @@ extern "C"
 		size_t unique;
 	} BNFirmwareNinjaDeviceAccesses;
 
-	typedef struct BNLineFormatterSettings
-	{
-		BNHighLevelILFunction* highLevelIL;
-		size_t desiredLineLength;
-		size_t minimumContentLength;
-		size_t tabWidth;
-		char* languageName;
-		char* commentStartString;
-		char* commentEndString;
-		char* annotationStartString;
-		char* annotationEndString;
-	} BNLineFormatterSettings;
-
-	typedef struct BNCustomLineFormatter
-	{
-		void* context;
-		BNDisassemblyTextLine* (*formatLines)(void* ctxt, BNDisassemblyTextLine* inLines, size_t inCount,
-			const BNLineFormatterSettings* settings, size_t* outCount);
-		void (*freeLines)(void* ctxt, BNDisassemblyTextLine* lines, size_t count);
-	} BNCustomLineFormatter;
-
-
 	BINARYNINJACOREAPI char* BNAllocString(const char* contents);
 	BINARYNINJACOREAPI char* BNAllocStringWithLength(const char* contents, size_t len);
 	BINARYNINJACOREAPI void BNFreeString(char* str);
@@ -5478,9 +5453,6 @@ extern "C"
 
 	// Disassembly settings
 	BINARYNINJACOREAPI BNDisassemblySettings* BNCreateDisassemblySettings(void);
-	BINARYNINJACOREAPI BNDisassemblySettings* BNDefaultDisassemblySettings(void);
-	BINARYNINJACOREAPI BNDisassemblySettings* BNDefaultGraphDisassemblySettings(void);
-	BINARYNINJACOREAPI BNDisassemblySettings* BNDefaultLinearDisassemblySettings(void);
 	BINARYNINJACOREAPI BNDisassemblySettings* BNNewDisassemblySettingsReference(BNDisassemblySettings* settings);
 	BINARYNINJACOREAPI BNDisassemblySettings* BNDuplicateDisassemblySettings(BNDisassemblySettings* settings);
 	BINARYNINJACOREAPI void BNFreeDisassemblySettings(BNDisassemblySettings* settings);
@@ -6171,19 +6143,15 @@ extern "C"
 		BNLanguageRepresentationFunctionType* type, BNBinaryView* view);
 	BINARYNINJACOREAPI BNTypePrinter* BNGetLanguageRepresentationFunctionTypePrinter(BNLanguageRepresentationFunctionType* type);
 	BINARYNINJACOREAPI BNTypeParser* BNGetLanguageRepresentationFunctionTypeParser(BNLanguageRepresentationFunctionType* type);
-	BINARYNINJACOREAPI BNLineFormatter* BNGetLanguageRepresentationFunctionTypeLineFormatter(
-		BNLanguageRepresentationFunctionType* type);
 	BINARYNINJACOREAPI BNDisassemblyTextLine* BNGetLanguageRepresentationFunctionTypeFunctionTypeTokens(
 		BNLanguageRepresentationFunctionType* type, BNFunction* func, BNDisassemblySettings* settings, size_t* count);
 
 	BINARYNINJACOREAPI BNLanguageRepresentationFunction* BNCreateCustomLanguageRepresentationFunction(
-		BNLanguageRepresentationFunctionType* type, BNArchitecture* arch, BNFunction* func,
-		BNHighLevelILFunction* highLevelIL, BNCustomLanguageRepresentationFunction* callbacks);
+		BNArchitecture* arch, BNFunction* func, BNHighLevelILFunction* highLevelIL,
+		BNCustomLanguageRepresentationFunction* callbacks);
 	BINARYNINJACOREAPI BNLanguageRepresentationFunction* BNNewLanguageRepresentationFunctionReference(
 		BNLanguageRepresentationFunction* func);
 	BINARYNINJACOREAPI void BNFreeLanguageRepresentationFunction(BNLanguageRepresentationFunction* func);
-	BINARYNINJACOREAPI BNLanguageRepresentationFunctionType* BNGetLanguageRepresentationType(
-		BNLanguageRepresentationFunction* func);
 	BINARYNINJACOREAPI BNArchitecture* BNGetLanguageRepresentationArchitecture(BNLanguageRepresentationFunction* func);
 	BINARYNINJACOREAPI BNFunction* BNGetLanguageRepresentationOwnerFunction(BNLanguageRepresentationFunction* func);
 	BINARYNINJACOREAPI BNHighLevelILFunction* BNGetLanguageRepresentationILFunction(BNLanguageRepresentationFunction* func);
@@ -8088,25 +8056,6 @@ extern "C"
 	BINARYNINJACOREAPI void BNFreeFirmwareNinjaReferenceNode(BNFirmwareNinjaReferenceNode* node);
 	BINARYNINJACOREAPI BNFirmwareNinjaReferenceNode* BNNewFirmwareNinjaReferenceNodeReference(BNFirmwareNinjaReferenceNode* node);
 	BINARYNINJACOREAPI void BNFreeFirmwareNinjaReferenceNodes(BNFirmwareNinjaReferenceNode** nodes, size_t count);
-
-	// Line formatters
-	BINARYNINJACOREAPI BNLineFormatter* BNRegisterLineFormatter(const char* name, BNCustomLineFormatter* callbacks);
-	BINARYNINJACOREAPI BNLineFormatter** BNGetLineFormatterList(size_t* count);
-	BINARYNINJACOREAPI void BNFreeLineFormatterList(BNLineFormatter** formatters);
-	BINARYNINJACOREAPI BNLineFormatter* BNGetLineFormatterByName(const char* name);
-	BINARYNINJACOREAPI BNLineFormatter* BNGetDefaultLineFormatter();
-
-	BINARYNINJACOREAPI char* BNGetLineFormatterName(BNLineFormatter* formatter);
-
-	BINARYNINJACOREAPI BNDisassemblyTextLine* BNFormatLines(BNLineFormatter* formatter, BNDisassemblyTextLine* inLines,
-		size_t inCount, const BNLineFormatterSettings* settings, size_t* outCount);
-
-	BINARYNINJACOREAPI BNLineFormatterSettings* BNGetDefaultLineFormatterSettings(
-		BNDisassemblySettings* settings, BNHighLevelILFunction* func);
-	BINARYNINJACOREAPI BNLineFormatterSettings* BNGetLanguageRepresentationLineFormatterSettings(
-		BNDisassemblySettings* settings, BNLanguageRepresentationFunction* func);
-	BINARYNINJACOREAPI void BNFreeLineFormatterSettings(BNLineFormatterSettings* settings);
-
 #ifdef __cplusplus
 }
 #endif