From e78cae77103b5396ce42d9e33593ea55f9135be0 Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Mon, 20 Jan 2025 18:44:25 -0500 Subject: Revert "Add line formatter API and a generic line formatter plugin" This reverts commit 1699c71999d29d32aba5c9f8fea193a661a4b02b. --- languagerepresentation.cpp | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'languagerepresentation.cpp') diff --git a/languagerepresentation.cpp b/languagerepresentation.cpp index 1af38b4b..0930c0b8 100644 --- a/languagerepresentation.cpp +++ b/languagerepresentation.cpp @@ -4,8 +4,7 @@ using namespace BinaryNinja; using namespace std; -LanguageRepresentationFunction::LanguageRepresentationFunction( - LanguageRepresentationFunctionType* type, Architecture* arch, Function* func, HighLevelILFunction* highLevelIL) +LanguageRepresentationFunction::LanguageRepresentationFunction(Architecture* arch, Function* func, HighLevelILFunction* highLevelIL) { BNCustomLanguageRepresentationFunction callbacks; callbacks.context = this; @@ -21,8 +20,8 @@ LanguageRepresentationFunction::LanguageRepresentationFunction( callbacks.getAnnotationStartString = GetAnnotationStartStringCallback; callbacks.getAnnotationEndString = GetAnnotationEndStringCallback; AddRefForRegistration(); - m_object = BNCreateCustomLanguageRepresentationFunction( - type->GetObject(), arch->GetObject(), func->GetObject(), highLevelIL->GetObject(), &callbacks); + m_object = BNCreateCustomLanguageRepresentationFunction(arch->GetObject(), func->GetObject(), + highLevelIL->GetObject(), &callbacks); } @@ -113,12 +112,6 @@ BNHighlightColor LanguageRepresentationFunction::GetHighlight(BasicBlock* block) } -Ref LanguageRepresentationFunction::GetLanguage() const -{ - return new CoreLanguageRepresentationFunctionType(BNGetLanguageRepresentationType(m_object)); -} - - Ref LanguageRepresentationFunction::GetArchitecture() const { return new CoreArchitecture(BNGetLanguageRepresentationArchitecture(m_object)); @@ -319,7 +312,6 @@ void LanguageRepresentationFunctionType::Register(LanguageRepresentationFunction callbacks.isValid = IsValidCallback; callbacks.getTypePrinter = GetTypePrinterCallback; callbacks.getTypeParser = GetTypeParserCallback; - callbacks.getLineFormatter = GetLineFormatterCallback; callbacks.getFunctionTypeTokens = GetFunctionTypeTokensCallback; callbacks.freeLines = FreeLinesCallback; @@ -371,16 +363,6 @@ BNTypeParser* LanguageRepresentationFunctionType::GetTypeParserCallback(void* ct } -BNLineFormatter* LanguageRepresentationFunctionType::GetLineFormatterCallback(void* ctxt) -{ - LanguageRepresentationFunctionType* type = (LanguageRepresentationFunctionType*)ctxt; - Ref result = type->GetLineFormatter(); - if (!result) - return nullptr; - return result->GetObject(); -} - - BNDisassemblyTextLine* LanguageRepresentationFunctionType::GetFunctionTypeTokensCallback( void* ctxt, BNFunction* func, BNDisassemblySettings* settings, size_t* count) { @@ -490,15 +472,6 @@ Ref CoreLanguageRepresentationFunctionType::GetTypeParser() } -Ref CoreLanguageRepresentationFunctionType::GetLineFormatter() -{ - BNLineFormatter* formatter = BNGetLanguageRepresentationFunctionTypeLineFormatter(m_object); - if (!formatter) - return nullptr; - return new CoreLineFormatter(formatter); -} - - vector CoreLanguageRepresentationFunctionType::GetFunctionTypeTokens( Function* func, DisassemblySettings* settings) { -- cgit v1.3.1