diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2017-01-04 08:54:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-04 08:54:33 +0100 |
| commit | 2b93bc6682f3a08a5eccccefa135535708434f9e (patch) | |
| tree | 18463c385c51811afed7b7f5bb3fe48b2e4dea22 /miasm2/core/cpu.py | |
| parent | b3146a420c32af65fafc2fd8ea4c5087efcf6f39 (diff) | |
| parent | 13e2984d24d49ad0a4c6fea307af9cedd4aa914d (diff) | |
| download | miasm-2b93bc6682f3a08a5eccccefa135535708434f9e.tar.gz miasm-2b93bc6682f3a08a5eccccefa135535708434f9e.zip | |
Merge pull request #464 from a-vincent/multiple_disas_warning
Raise with a more helpful message on multiple disassemblies
Diffstat (limited to 'miasm2/core/cpu.py')
| -rw-r--r-- | miasm2/core/cpu.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py index a6a65796..7a2968f9 100644 --- a/miasm2/core/cpu.py +++ b/miasm2/core/cpu.py @@ -1176,11 +1176,11 @@ class cls_mn(object): if not alias: log.warning('dis multiple args ret default') - assert(len(out) == 2) for i, o in enumerate(out_c): if o.alias: return out[i] - raise NotImplementedError('not fully functional') + raise NotImplementedError('Multiple disas: \n' + + "\n".join([str(x) for x in out])) return out[0] @classmethod |