diff options
| author | Camille Mougey <commial@gmail.com> | 2018-06-20 17:33:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 17:33:23 +0200 |
| commit | 4c33cf22260fc2bc870de9f474e9043ddc1d6019 (patch) | |
| tree | c99cce3d47d225da1a86d9b80bdaebea7d8186f6 | |
| parent | 8a2c80d3381a913235948a42625162fd11e97a46 (diff) | |
| parent | 3667e05bbd7f2ebb6aa856b99df9d7ffd0a18ca3 (diff) | |
| download | miasm-4c33cf22260fc2bc870de9f474e9043ddc1d6019.tar.gz miasm-4c33cf22260fc2bc870de9f474e9043ddc1d6019.zip | |
Merge pull request #773 from serpilliere/fix_bad_doc
Cpu: fix bad doc
| -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) |