From be72df48408a4f3ae7cd92e9a89adf04d43025bf Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Sat, 11 Apr 2020 22:22:12 -0400 Subject: Remove old linear view implementation --- binaryview.cpp | 88 ---------------------------------------------------------- 1 file changed, 88 deletions(-) (limited to 'binaryview.cpp') diff --git a/binaryview.cpp b/binaryview.cpp index 32cc688d..30aeeae8 100644 --- a/binaryview.cpp +++ b/binaryview.cpp @@ -2446,94 +2446,6 @@ uint64_t BinaryView::GetPreviousDataVariableStartBeforeAddress(uint64_t addr) } -LinearDisassemblyPosition BinaryView::GetLinearDisassemblyPositionForAddress(uint64_t addr, - DisassemblySettings* settings) -{ - BNLinearDisassemblyPosition pos = BNGetLinearDisassemblyPositionForAddress(m_object, addr, - settings ? settings->GetObject() : nullptr); - - LinearDisassemblyPosition result; - result.function = pos.function ? new Function(pos.function) : nullptr; - result.block = pos.block ? new BasicBlock(pos.block) : nullptr; - result.address = pos.address; - return result; -} - - -vector BinaryView::GetPreviousLinearDisassemblyLines(LinearDisassemblyPosition& pos, - DisassemblySettings* settings) -{ - BNLinearDisassemblyPosition linearPos; - linearPos.function = pos.function ? BNNewFunctionReference(pos.function->GetObject()) : nullptr; - linearPos.block = pos.block ? BNNewBasicBlockReference(pos.block->GetObject()) : nullptr; - linearPos.address = pos.address; - - size_t count; - BNLinearDisassemblyLine* lines = BNGetPreviousLinearDisassemblyLines(m_object, &linearPos, - settings ? settings->GetObject() : nullptr, &count); - - vector result; - result.reserve(count); - for (size_t i = 0; i < count; i++) - { - LinearDisassemblyLine line; - line.type = lines[i].type; - line.function = lines[i].function ? new Function(BNNewFunctionReference(lines[i].function)) : nullptr; - line.block = lines[i].block ? new BasicBlock(BNNewBasicBlockReference(lines[i].block)) : nullptr; - line.contents.addr = lines[i].contents.addr; - line.contents.instrIndex = lines[i].contents.instrIndex; - line.contents.highlight = lines[i].contents.highlight; - line.contents.tokens = InstructionTextToken::ConvertInstructionTextTokenList(lines[i].contents.tokens, lines[i].contents.count); - line.contents.tags = Tag::ConvertTagList(lines[i].contents.tags, lines[i].contents.tagCount); - result.push_back(line); - } - - pos.function = linearPos.function ? new Function(linearPos.function) : nullptr; - pos.block = linearPos.block ? new BasicBlock(linearPos.block) : nullptr; - pos.address = linearPos.address; - - BNFreeLinearDisassemblyLines(lines, count); - return result; -} - - -vector BinaryView::GetNextLinearDisassemblyLines(LinearDisassemblyPosition& pos, - DisassemblySettings* settings) -{ - BNLinearDisassemblyPosition linearPos; - linearPos.function = pos.function ? BNNewFunctionReference(pos.function->GetObject()) : nullptr; - linearPos.block = pos.block ? BNNewBasicBlockReference(pos.block->GetObject()) : nullptr; - linearPos.address = pos.address; - - size_t count; - BNLinearDisassemblyLine* lines = BNGetNextLinearDisassemblyLines(m_object, &linearPos, - settings ? settings->GetObject() : nullptr, &count); - - vector result; - result.reserve(count); - for (size_t i = 0; i < count; i++) - { - LinearDisassemblyLine line; - line.type = lines[i].type; - line.function = lines[i].function ? new Function(BNNewFunctionReference(lines[i].function)) : nullptr; - line.block = lines[i].block ? new BasicBlock(BNNewBasicBlockReference(lines[i].block)) : nullptr; - line.contents.addr = lines[i].contents.addr; - line.contents.instrIndex = lines[i].contents.instrIndex; - line.contents.highlight = lines[i].contents.highlight; - line.contents.tokens = InstructionTextToken::ConvertInstructionTextTokenList(lines[i].contents.tokens, lines[i].contents.count); - line.contents.tags = Tag::ConvertTagList(lines[i].contents.tags, lines[i].contents.tagCount); - result.push_back(line); - } - - pos.function = linearPos.function ? new Function(linearPos.function) : nullptr; - pos.block = linearPos.block ? new BasicBlock(linearPos.block) : nullptr; - pos.address = linearPos.address; - - BNFreeLinearDisassemblyLines(lines, count); - return result; -} - - bool BinaryView::ParseTypeString(const string& text, QualifiedNameAndType& result, string& errors) { BNQualifiedNameAndType nt; -- cgit v1.3.1