Use default ABB from Python plugins

Author: zznop

defaultabb.cpp

@@ -1,3 +1,6 @@
+#include <map>
+#include <set>
+#include <queue>
 #include <inttypes.h>
 #include "binaryninjaapi.h"
 #include "binaryninjacore.h"
@@ -235,7 +238,8 @@ void Architecture::DefaultAnalyzeBasicBlocks(Function& function, BNBasicBlockAna
 			size_t maxLen = data->Read(opcode, location.address, location.arch->GetMaxInstructionLength());
 			if (maxLen == 0)
 			{
-				//string text = fmt::bnformat("Could not read instruction at {:#x}", location.address);
+				string text = fmt::format("Could not read instruction at {:#x}", location.address);
+				function.CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
 				if (location.arch->GetInstructionAlignment() == 0)
 					location.address++;
 				else
@@ -248,8 +252,8 @@ void Architecture::DefaultAnalyzeBasicBlocks(Function& function, BNBasicBlockAna
 			info.delaySlots = delaySlotCount;
 			if (!location.arch->GetInstructionInfo(opcode, location.address, maxLen, info))
 			{
-				//string text = fmt::bnformat("Could not get instruction info at {:#x}", location.address);
-				//function->CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
+				string text = fmt::format("Could not get instruction info at {:#x}", location.address);
+				function.CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
 				if (location.arch->GetInstructionAlignment() == 0)
 					location.address++;
 				else
@@ -261,8 +265,8 @@ void Architecture::DefaultAnalyzeBasicBlocks(Function& function, BNBasicBlockAna
 			// The instruction is invalid if it has no length or is above maximum length
 			if ((info.length == 0) || (info.length > maxLen))
 			{
-				//string text = fmt::bnformat("Instruction of invalid length at {:#x}", location.address);
-				//function->CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
+				string text = fmt::format("Instruction of invalid length at {:#x}", location.address);
+				function.CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
 				if (location.arch->GetInstructionAlignment() == 0)
 					location.address++;
 				else
@@ -278,8 +282,8 @@ void Architecture::DefaultAnalyzeBasicBlocks(Function& function, BNBasicBlockAna
 				((!IsOffsetCodeSemanticsFast(data, readOnlySections, dataExternSections, instrEnd) && IsOffsetCodeSemanticsFast(data, readOnlySections, dataExternSections,location.address)) ||
 				(!data->IsOffsetBackedByFile(instrEnd) && data->IsOffsetBackedByFile(location.address))))
 			{
-				//string text = fmt::bnformat("Instruction at {:#x} straddles a non-code section", location.address);
-				//function->CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
+				string text = fmt::format("Instruction at {:#x} straddles a non-code section", location.address);
+				function.CreateAutoAddressTag(location.arch, location.address, "Invalid Instruction", text, true);
 				if (location.arch->GetInstructionAlignment() == 0)
 					location.address++;
 				else
@@ -420,8 +424,8 @@ void Architecture::DefaultAnalyzeBasicBlocks(Function& function, BNBasicBlockAna
 							if (!fastPath && !IsOffsetCodeSemanticsFast(data, readOnlySections, dataExternSections, target.address) &&
 								IsOffsetCodeSemanticsFast(data, readOnlySections, dataExternSections, location.address))
 							{
-								//string message = fmt::bnformat("Non-code call target {:#x}", target.address);
-								//function->CreateAutoAddressTag(target.arch, location.address, "Non-code Branch", message, true);
+								string message = fmt::format("Non-code call target {:#x}", target.address);
+								function.CreateAutoAddressTag(target.arch, location.address, "Non-code Branch", message, true);
 								break;
 							}
 

python/architecture.py

@@ -246,6 +246,7 @@ def __init__(self):
 		self._cb.getInstructionLowLevelIL = self._cb.getInstructionLowLevelIL.__class__(
 		    self._get_instruction_low_level_il
 		)
+		self._cb.analyzeBasicBlocks = self._cb.analyzeBasicBlocks.__class__(self._analyze_basic_blocks)
 		self._cb.getRegisterName = self._cb.getRegisterName.__class__(self._get_register_name)
 		self._cb.getFlagName = self._cb.getFlagName.__class__(self._get_flag_name)
 		self._cb.getFlagWriteTypeName = self._cb.getFlagWriteTypeName.__class__(self._get_flag_write_type_name)
@@ -710,6 +711,12 @@ def _get_instruction_low_level_il(self, ctxt, data, addr, length, il):
 			log_error(traceback.format_exc())
 			return False
 
+	def _analyze_basic_blocks(self, ctx, func, context):
+		try:
+			self.analyze_basic_blocks(function.Function(handle=core.BNNewFunctionReference(func)), context)
+		except:
+			log_error(traceback.format_exc())
+
 	def _get_register_name(self, ctxt, reg):
 		try:
 			if reg in self._regs_by_index:
@@ -1425,6 +1432,21 @@ def get_instruction_low_level_il(self, data: bytes, addr: int, il: lowlevelil.Lo
 		"""
 		raise NotImplementedError
 
+	def analyze_basic_blocks(self, func, context):
+		"""
+		``analyze_basic_blocks`` performs function-level basic block recovery and commits the blocks to analysis
+
+		.. note:: Architecture subclasses should not implement this method unless function-level lifting is required
+
+		:param Function func: the function to analyze
+		:param BNBasicBlockAnalysisContext context: the analysis context
+		"""
+
+		try:
+			core.BNArchitectureDefaultAnalyzeBasicBlocks(func.handle, context)
+		except:
+			log_error(traceback.format_exc())
+
 	def get_low_level_il_from_bytes(self, data: bytes, addr: int) -> 'lowlevelil.LowLevelILInstruction':
 		"""
 		``get_low_level_il_from_bytes`` converts the instruction in bytes to ``il`` at the given virtual address