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/arch/arm/arch.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/arch/arm/arch.py')
| -rw-r--r-- | miasm2/arch/arm/arch.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py index 0e58008d..d9bf42ba 100644 --- a/miasm2/arch/arm/arch.py +++ b/miasm2/arch/arm/arch.py @@ -181,18 +181,14 @@ int_or_expr = base_expr def ast_id2expr(t): - if not t in mn_arm.regs.all_regs_ids_byname: - r = ExprId(asm_label(t)) - else: - r = mn_arm.regs.all_regs_ids_byname[t] - return r + return mn_arm.regs.all_regs_ids_byname.get(t, t) def ast_int2expr(a): return ExprInt32(a) -my_var_parser = parse_ast(ast_id2expr, ast_int2expr) +my_var_parser = ParseAst(ast_id2expr, ast_int2expr) base_expr.setParseAction(my_var_parser) |