diff options
Diffstat (limited to 'example')
| -rw-r--r-- | example/disasm/callback.py | 2 | ||||
| -rw-r--r-- | example/disasm/full.py | 4 | ||||
| -rw-r--r-- | example/expression/solve_condition_stp.py | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/example/disasm/callback.py b/example/disasm/callback.py index 4a7507dd..f1b2d3c8 100644 --- a/example/disasm/callback.py +++ b/example/disasm/callback.py @@ -1,5 +1,5 @@ from miasm2.core.bin_stream import bin_stream_str -from miasm2.core.asmbloc import asm_label, asm_constraint, expr_is_label +from miasm2.core.asmbloc import AsmLabel, asm_constraint, expr_is_label from miasm2.arch.x86.disasm import dis_x86_32, cb_x86_funcs diff --git a/example/disasm/full.py b/example/disasm/full.py index 5fc9008a..f28decbb 100644 --- a/example/disasm/full.py +++ b/example/disasm/full.py @@ -4,7 +4,7 @@ from argparse import ArgumentParser from pdb import pm from miasm2.analysis.binary import Container -from miasm2.core.asmbloc import log_asmbloc, asm_label, AsmCFG +from miasm2.core.asmbloc import log_asmbloc, AsmLabel, AsmCFG from miasm2.expression.expression import ExprId from miasm2.core.interval import interval from miasm2.analysis.machine import Machine @@ -139,7 +139,7 @@ while not finish and todo: if not isntr: continue for dest in instr.getdstflow(mdis.symbol_pool): - if not (isinstance(dest, ExprId) and isinstance(dest.name, asm_label)): + if not (isinstance(dest, ExprId) and isinstance(dest.name, AsmLabel)): continue todo.append((mdis, instr, dest.name.offset)) diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py index 5d3ebc59..fb227345 100644 --- a/example/expression/solve_condition_stp.py +++ b/example/expression/solve_condition_stp.py @@ -36,7 +36,7 @@ if not args: def get_block(ir_arch, mdis, ad): - if isinstance(ad, asmbloc.asm_label): + if isinstance(ad, asmbloc.AsmLabel): l = ad else: l = mdis.symbol_pool.getby_offset_create(ad) @@ -87,8 +87,8 @@ def emul_symb(ir_arch, mdis, states_todo, states_done): p2[ad.cond] = ExprInt(1, ad.cond.size) ad1 = expr_simp(sb.eval_expr(ad.replace_expr(c1), {})) ad2 = expr_simp(sb.eval_expr(ad.replace_expr(c2), {})) - if not (isinstance(ad1, ExprInt) or (isinstance(ad1, ExprId) and isinstance(ad1.name, asmbloc.asm_label)) and - isinstance(ad2, ExprInt) or (isinstance(ad2, ExprId) and isinstance(ad2.name, asmbloc.asm_label))): + if not (isinstance(ad1, ExprInt) or (isinstance(ad1, ExprId) and isinstance(ad1.name, asmbloc.AsmLabel)) and + isinstance(ad2, ExprInt) or (isinstance(ad2, ExprId) and isinstance(ad2.name, asmbloc.AsmLabel))): print str(ad1), str(ad2) raise ValueError("zarb condition") conds1 = list(conds) + c1.items() @@ -106,7 +106,7 @@ def emul_symb(ir_arch, mdis, states_todo, states_done): elif isinstance(ad, ExprInt): ad = int(ad.arg) states_todo.add((ad, sb.symbols.copy(), tuple(conds))) - elif isinstance(ad, ExprId) and isinstance(ad.name, asmbloc.asm_label): + elif isinstance(ad, ExprId) and isinstance(ad.name, asmbloc.AsmLabel): if isinstance(ad, ExprId): ad = ad.name states_todo.add((ad, sb.symbols.copy(), tuple(conds))) |