diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2015-01-12 13:14:00 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2015-01-12 13:14:00 +0100 |
| commit | 328c0f8f1c08a6412fe2083bfdc09f941f5ceb2e (patch) | |
| tree | df1fb5e6fefbd7e10e7ab7fd2d96dc87f712926f | |
| parent | ae9004eec4ef264013208e1ce50f6e884a4da23f (diff) | |
| parent | 817566b388a9a7a6b9c52700146d73e942eeb0c2 (diff) | |
| download | miasm-328c0f8f1c08a6412fe2083bfdc09f941f5ceb2e.tar.gz miasm-328c0f8f1c08a6412fe2083bfdc09f941f5ceb2e.zip | |
Merge pull request #33 from fmonjalet/tr_python_fix
TranslatorPython fixes
| -rw-r--r-- | miasm2/ir/translators/python.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/miasm2/ir/translators/python.py b/miasm2/ir/translators/python.py index f23d1907..c3386980 100644 --- a/miasm2/ir/translators/python.py +++ b/miasm2/ir/translators/python.py @@ -31,8 +31,7 @@ class TranslatorPython(Translator): out = cls.from_expr(expr.arg) if expr.start != 0: out = "(%s >> %d)" % (out, expr.start) - return "(%s & 0x%x)" % (cls.from_expr(expr.arg), - (1 << (expr.stop - expr.start)) - 1) + return "(%s & 0x%x)" % (out, (1 << (expr.stop - expr.start)) - 1) @classmethod def from_ExprCompose(cls, expr): @@ -58,7 +57,7 @@ class TranslatorPython(Translator): args[0], (1 << expr.size) - 1) else: - return "(%s & 0x%x)" % ((" %s " % expr.op).join(args), + return "((%s) & 0x%x)" % ((" %s " % expr.op).join(args), (1 << expr.size) - 1) elif expr.op == "parity": return "(%s & 0x1)" % cls.from_expr(expr.args[0]) |