From b0d967b687da543f1179c94a95c75ae543d1e47c Mon Sep 17 00:00:00 2001 From: feliam Date: Tue, 6 Jun 2017 12:16:30 -0300 Subject: [PATCH] remove callbacks (#282) --- manticore/core/memory.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/manticore/core/memory.py b/manticore/core/memory.py index 4bfabd6..7e09dbf 100644 --- a/manticore/core/memory.py +++ b/manticore/core/memory.py @@ -386,7 +386,6 @@ class Memory(object): else: self._maps = set(maps) self._page2map = WeakValueDictionary() #{page -> ref{MAP}} - self._callbacks = {} self._recording_stack = [] for m in self._maps: for i in range(self._page(m.start), self._page(m.end)): @@ -394,7 +393,7 @@ class Memory(object): self._page2map[i] = m def __reduce__(self): - return (self.__class__, (self._maps, ), {'_callbacks': self._callbacks}) + return (self.__class__, (self._maps, )) @abstractproperty def memory_bit_size(self): @@ -704,21 +703,6 @@ class Memory(object): def __contains__(self, address): return self._page(address) in self._page2map - def set_callback(self, name, callback): - ''' - Set or remove a callback for a named event. - Takes a callable that potentially receives parameter. - - :param name: Callback name - :param callback: The Callable to register. - ''' - if callback is None: - self._callbacks.pop(name,None) - return - if not hasattr(callback, '__call__'): - raise ValueError('Callback must be callable') - self.callback[name] = callback - def perms(self, index): # not happy with this interface. if isinstance(index, slice): @@ -767,9 +751,6 @@ class Memory(object): p+=_size assert p == stop - if 'read' in self._callbacks: - self._callbacks['read'](addr, result) - return result @@ -824,9 +805,6 @@ class Memory(object): addr+=size assert addr == stop - if 'write' in self._callbacks: - self._callbacks['write'](addr, buf) - def _get_size(self, size): return size