diff options
| author | Camille Mougey <commial@gmail.com> | 2017-02-13 16:24:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 16:24:19 +0100 |
| commit | 90e170f45e342d03875e95b86afb038cb25ad2c1 (patch) | |
| tree | f26149c559b32c700a8d7fb7c2a74693229d9f58 /miasm2/core/parse_asm.py | |
| parent | 827c6cb8e1cdcc6e501c319353f89615b9cc09c9 (diff) | |
| parent | a7c9a7f769094d0af3b7a98bdb7319bcb3921e11 (diff) | |
| download | miasm-90e170f45e342d03875e95b86afb038cb25ad2c1.tar.gz miasm-90e170f45e342d03875e95b86afb038cb25ad2c1.zip | |
Merge pull request #493 from serpilliere/fix_asm_parsing
Fix asm parsing
Diffstat (limited to 'miasm2/core/parse_asm.py')
| -rw-r--r-- | miasm2/core/parse_asm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py index 238306b3..11fa4040 100644 --- a/miasm2/core/parse_asm.py +++ b/miasm2/core/parse_asm.py @@ -3,7 +3,7 @@ import re import miasm2.expression.expression as m2_expr import miasm2.core.asmbloc as asmbloc -from miasm2.core.cpu import gen_base_expr, parse_ast +from miasm2.core.cpu import gen_base_expr, ParseAst from miasm2.core.cpu import instruction declarator = {'byte': 8, @@ -169,9 +169,9 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None): # parser base_expr = gen_base_expr()[2] - my_var_parser = parse_ast(lambda x: m2_expr.ExprId(x, size), - lambda x: - m2_expr.ExprInt(x, size)) + my_var_parser = ParseAst(lambda x: m2_expr.ExprId(x, size), + lambda x: + m2_expr.ExprInt(x, size)) base_expr.setParseAction(my_var_parser) for element in data_raw: |