diff options
Diffstat (limited to 'miasm2/analysis/disasm_cb.py')
| -rw-r--r-- | miasm2/analysis/disasm_cb.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/miasm2/analysis/disasm_cb.py b/miasm2/analysis/disasm_cb.py index f1f23377..284a2c99 100644 --- a/miasm2/analysis/disasm_cb.py +++ b/miasm2/analysis/disasm_cb.py @@ -2,8 +2,8 @@ from miasm2.expression.expression import ExprInt, ExprId, ExprMem, MatchExpr from miasm2.expression.simplifications import expr_simp -from miasm2.core.asmbloc \ - import asm_symbol_pool, asm_constraint_next, asm_constraint_to +from miasm2.core.asmblock \ + import AsmSymbolPool, AsmConstraintNext, AsmConstraintTo from miasm2.core.utils import upck32 # from miasm2.core.graph import DiGraph @@ -25,21 +25,21 @@ def arm_guess_subcall( mnemo, attrib, pool_bin, cur_bloc, offsets_to_dis, symbol_pool): ira = get_ira(mnemo, attrib) - sp = asm_symbol_pool() + sp = AsmSymbolPool() ir_arch = ira(sp) print '###' print cur_bloc ir_arch.add_bloc(cur_bloc) - ir_blocs = ir_arch.blocs.values() + ir_blocks = ir_arch.blocks.values() # flow_graph = DiGraph() to_add = set() - for irb in ir_blocs: + for irblock in ir_blocks: # print 'X'*40 - # print irb + # print irblock pc_val = None lr_val = None - for exprs in irb.irs: + for exprs in irblock.irs: for e in exprs: if e.dst == ir_arch.pc: pc_val = e.src @@ -55,7 +55,7 @@ def arm_guess_subcall( continue # print 'IS CALL!' l = symbol_pool.getby_offset_create(int(lr_val)) - c = asm_constraint_next(l) + c = AsmConstraintNext(l) to_add.add(c) offsets_to_dis.add(int(lr_val)) @@ -74,17 +74,17 @@ def arm_guess_jump_table( jra = ExprId('jra') jrb = ExprId('jrb') - sp = asm_symbol_pool() + sp = AsmSymbolPool() ir_arch = ira(sp) ir_arch.add_bloc(cur_bloc) - ir_blocs = ir_arch.blocs.values() - for irb in ir_blocs: + ir_blocks = ir_arch.blocks.values() + for irblock in ir_blocks: # print 'X'*40 - # print irb + # print irblock pc_val = None # lr_val = None - for exprs in irb.irs: + for exprs in irblock.irs: for e in exprs: if e.dst == ir_arch.pc: pc_val = e.src @@ -125,7 +125,7 @@ def arm_guess_jump_table( for ad in addrs: offsets_to_dis.add(ad) l = symbol_pool.getby_offset_create(ad) - c = asm_constraint_to(l) + c = AsmConstraintTo(l) cur_bloc.addto(c) guess_funcs = [] |