diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2015-12-12 14:35:24 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2015-12-12 14:35:24 +0100 |
| commit | b32eb145fce7dd09bef025a9f82b2507bd4e02ee (patch) | |
| tree | 2c65f005adb7830853664451aed3f2cd05a9be73 /miasm2/arch/x86/ira.py | |
| parent | 635f372fa846b28252ab86b344a2565f51e2302c (diff) | |
| parent | d95af9858230c41449d6fd487a93bdc337780ea7 (diff) | |
| download | miasm-b32eb145fce7dd09bef025a9f82b2507bd4e02ee.tar.gz miasm-b32eb145fce7dd09bef025a9f82b2507bd4e02ee.zip | |
Merge pull request #290 from commial/refactor-ira
Refactor ira
Diffstat (limited to 'miasm2/arch/x86/ira.py')
| -rw-r--r-- | miasm2/arch/x86/ira.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/miasm2/arch/x86/ira.py b/miasm2/arch/x86/ira.py index 5bc4761f..b7a1f19f 100644 --- a/miasm2/arch/x86/ira.py +++ b/miasm2/arch/x86/ira.py @@ -3,6 +3,7 @@ from miasm2.expression.expression import ExprAff, ExprOp, ExprId from miasm2.core.graph import DiGraph +from miasm2.core.asmbloc import expr_is_label from miasm2.ir.ir import ir, irbloc from miasm2.ir.analysis import ira from miasm2.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64 @@ -46,7 +47,7 @@ class ir_a_x86_16(ir_x86_16, ira): if not l.is_subcall(): return sub_call_dst = l.args[0] - if self.ExprIsLabel(sub_call_dst): + if expr_is_label(sub_call_dst): sub_call_dst = sub_call_dst.name for b in ir_blocs: l = b.lines[-1] @@ -54,7 +55,7 @@ class ir_a_x86_16(ir_x86_16, ira): if not l.is_subcall(): continue sub_call_dst = l.args[0] - if self.ExprIsLabel(sub_call_dst): + if expr_is_label(sub_call_dst): sub_call_dst = sub_call_dst.name lbl = bloc.get_next() new_lbl = self.gen_label() |