diff options
| author | Camille Mougey <commial@gmail.com> | 2016-12-23 17:47:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 17:47:46 +0100 |
| commit | da74f9672cd53999b3b0aecd80108a85e7b5dec4 (patch) | |
| tree | 470685abcee2084efbde7a41277d50c92ec46a40 /miasm2/core | |
| parent | 336081ceab4c81502dfe9092acdc7fadb8eb0811 (diff) | |
| parent | 494ba6e2b3711b519d7f99f2867e293b0f1650eb (diff) | |
| download | miasm-da74f9672cd53999b3b0aecd80108a85e7b5dec4.tar.gz miasm-da74f9672cd53999b3b0aecd80108a85e7b5dec4.zip | |
Merge pull request #463 from serpilliere/add_expr_type_access
Add expr type access
Diffstat (limited to '')
| -rw-r--r-- | miasm2/core/asmbloc.py | 2 | ||||
| -rw-r--r-- | miasm2/core/cpu.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py index f6d6154b..730d6d7d 100644 --- a/miasm2/core/asmbloc.py +++ b/miasm2/core/asmbloc.py @@ -871,7 +871,7 @@ def fix_expr_val(expr, symbols): def expr_calc(e): if isinstance(e, m2_expr.ExprId): s = symbols._name2label[e.name] - e = m2_expr.ExprInt_from(e, s.offset) + e = m2_expr.ExprInt(s.offset, e.size) return e result = expr.visit(expr_calc) result = expr_simp(result) diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py index 81c18f1f..a6a65796 100644 --- a/miasm2/core/cpu.py +++ b/miasm2/core/cpu.py @@ -921,7 +921,7 @@ class instruction(object): return o def get_asm_offset(self, expr): - return m2_expr.ExprInt_from(expr, self.offset) + return m2_expr.ExprInt(self.offset, expr.size) def resolve_args_with_symbols(self, symbols=None): if symbols is None: |