Sort switch blocks in graph view by case number

2 files changed, 16 insertions, 0 deletions

diff --git a/python/basicblock.py b/python/basicblock.py
index fc8b89e1..69f9f996 100644
--- a/python/basicblock.py
+++ b/python/basicblock.py
@@ -705,6 +705,14 @@ class BasicBlock:
 		return self.function.get_block_annotations(self.start, self.arch)
 
 	@property
+	def sort_hint(self) -> Optional[int]:
+		"""Graph edge sorting hint for this block (read-only)"""
+		if self.function is None:
+			raise ValueError("Attempting to call BasicBlock.sort_hint when Function is None")
+
+		return self.function.get_block_sort_hint(self.start, self.arch)
+
+	@property
 	def disassembly_text(self) -> List['_function.DisassemblyTextLine']:
 		"""
 		``disassembly_text`` property which returns a list of function.DisassemblyTextLine objects for the current basic block.
diff --git a/python/function.py b/python/function.py
index 9f5e89bb..8c9eaf1d 100644
--- a/python/function.py
+++ b/python/function.py
@@ -2437,6 +2437,14 @@ class Function:
 		finally:
 			core.BNFreeInstructionTextLines(lines, count.value)
 
+	def get_block_sort_hint(self, addr: int, arch: Optional['architecture.Architecture'] = None) -> Optional[int]:
+		if arch is None:
+			arch = self.arch
+		result = ctypes.c_int64()
+		if not core.BNGetFunctionBlockSortHint(self.handle, arch.handle, addr, ctypes.byref(result)):
+			return None
+		return result.value
+
 	def set_auto_type(self, value: StringOrType) -> None:
 		if isinstance(value, str):
 			(value, _) = self.view.parse_type_string(value)