From 4bdaeeece4707a936730c39bb26a25423fb44bfc Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Fri, 17 Sep 2021 11:47:03 -0400 Subject: Add back in get_disassembly minus the cruft for backward compatibility --- python/basicblock.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'python/basicblock.py') diff --git a/python/basicblock.py b/python/basicblock.py index e18c60b3..887f6679 100644 --- a/python/basicblock.py +++ b/python/basicblock.py @@ -100,18 +100,18 @@ class BasicBlock: idx = self.start while idx < self.end: data = self.view.read(idx, min(self.arch.max_instr_length, self.end - idx)) - inst_text = self.arch.get_instruction_text(data, idx) - if inst_text[1] == 0: + text, size = self.arch.get_instruction_text(data, idx) + if size == 0: break - yield inst_text - idx += inst_text[1] + yield text, size + idx += size else: assert self._instLengths is not None for start, length in zip(self._instStarts, self._instLengths): - inst_text = self.arch.get_instruction_text(self.view.read(start, length), start) - if inst_text[1] == 0: + text, size = self.arch.get_instruction_text(self.view.read(start, length), start) + if size == 0: break - yield inst_text + yield text, size def __getitem__(self, i): self._buildStartCache() -- cgit v1.3.1