diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-06-19 17:45:55 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-06-19 17:45:55 +0200 |
| commit | 3667e05bbd7f2ebb6aa856b99df9d7ffd0a18ca3 (patch) | |
| tree | 9f089a88b7e43aaa79671cecd4dab3e681d77ffa | |
| parent | 8f5ca332780cf9e08761060e9903bc085dbc8430 (diff) | |
| download | miasm-3667e05bbd7f2ebb6aa856b99df9d7ffd0a18ca3.tar.gz miasm-3667e05bbd7f2ebb6aa856b99df9d7ffd0a18ca3.zip | |
Cpu: fix bad doc
Diffstat (limited to '')
| -rw-r--r-- | miasm2/core/asmblock.py | 4 | ||||
| -rw-r--r-- | miasm2/core/cpu.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/core/asmblock.py b/miasm2/core/asmblock.py index 35b7e1db..08ff25e9 100644 --- a/miasm2/core/asmblock.py +++ b/miasm2/core/asmblock.py @@ -521,7 +521,7 @@ class AsmSymbolPool(object): return "".join("%s\n" % loc_key for loc_key in self._loc_keys) def __getitem__(self, item): - warnings.warn('DEPRECATION WARNING: use "offset_to_loc_key" or "name_to_loc_key"') + warnings.warn('DEPRECATION WARNING: use "getby_name" or "getby_offset"') if item in self._name_to_loc_key: return self._name_to_loc_key[item] if item in self._offset_to_loc_key: @@ -529,7 +529,7 @@ class AsmSymbolPool(object): raise KeyError('unknown symbol %r' % item) def __contains__(self, item): - warnings.warn('DEPRECATION WARNING: use "offset_to_loc_key" or "name_to_loc_key"') + warnings.warn('DEPRECATION WARNING: use "getby_name" or "getby_offset"') return item in self._name_to_loc_key or item in self._offset_to_loc_key def merge(self, symbol_pool): diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py index a142ab77..80f81aff 100644 --- a/miasm2/core/cpu.py +++ b/miasm2/core/cpu.py @@ -1030,7 +1030,7 @@ class instruction(object): if name == '_': fixed_expr[exprloc] = self.get_asm_next_offset(exprloc) continue - if not name in symbols: + if symbols.getby_name(name) is None: raise ValueError('Unresolved symbol: %r' % exprloc) offset = symbols.loc_key_to_offset(loc_key) |