diff options
Diffstat (limited to 'python/basicblock.py')
| -rw-r--r-- | python/basicblock.py | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/python/basicblock.py b/python/basicblock.py index bfd80387..5bcf6aff 100644 --- a/python/basicblock.py +++ b/python/basicblock.py @@ -39,14 +39,6 @@ class BasicBlockEdge(object): self._back_edge = back_edge self._fall_through = fall_through - def __eq__(self, value): - if not isinstance(value, BasicBlockEdge): - return False - return (self._type, self._source, self._target, self._back_edge, self._fall_through) == (value.type, value.source, value.target, value.back_edge, value.fall_through) - - def __hash__(self): - return hash((self._type, self._source, self._target, self.back_edge, self.fall_through)) - def __repr__(self): if self._type == BranchType.UnresolvedBranch: return "<%s>" % BranchType(self._type).name @@ -55,6 +47,20 @@ class BasicBlockEdge(object): else: return "<%s: %#x>" % (BranchType(self._type).name, self._target.start) + def __eq__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return (self._type, self._source, self._target, self._back_edge, self._fall_through) == \ + (other._type, other._source, other._target, other._back_edge, other._fall_through) + + def __ne__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return not (self == other) + + def __hash__(self): + return hash((self._type, self._source, self._target, self.back_edge, self.fall_through)) + @property def type(self): """ """ @@ -114,15 +120,28 @@ class BasicBlock(object): def __del__(self): core.BNFreeBasicBlock(self.handle) - def __eq__(self, value): - if not isinstance(value, BasicBlock): - return False - return ctypes.addressof(self.handle.contents) == ctypes.addressof(value.handle.contents) + def __repr__(self): + arch = self.arch + if arch: + return "<block: %s@%#x-%#x>" % (arch.name, self.start, self.end) + else: + return "<block: %#x-%#x>" % (self.start, self.end) + + def __len__(self): + return int(core.BNGetBasicBlockLength(self.handle)) - def __ne__(self, value): - if not isinstance(value, BasicBlock): - return True - return ctypes.addressof(self.handle.contents) != ctypes.addressof(value.handle.contents) + def __eq__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return ctypes.addressof(self.handle.contents) == ctypes.addressof(other.handle.contents) + + def __ne__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return not (self == other) + + def __hash__(self): + return hash((self.start, self.end, self.arch.name)) def __setattr__(self, name, value): try: @@ -130,16 +149,6 @@ class BasicBlock(object): except AttributeError: raise AttributeError("attribute '%s' is read only" % name) - def __len__(self): - return int(core.BNGetBasicBlockLength(self.handle)) - - def __repr__(self): - arch = self.arch - if arch: - return "<block: %s@%#x-%#x>" % (arch.name, self.start, self.end) - else: - return "<block: %#x-%#x>" % (self.start, self.end) - def __iter__(self): if self._instStarts is None: # don't and instruction start cache the object is likely ephemeral @@ -165,9 +174,6 @@ class BasicBlock(object): data = self._view.read(start, length) return self.arch.get_instruction_text(data, start) - def __hash__(self): - return hash((self.start, self.end, self.arch.name)) - def _buildStartCache(self): if self._instStarts is None: # build the instruction start cache |