diff options
| -rw-r--r-- | example/expression/solve_condition_stp.py | 2 | ||||
| -rw-r--r-- | example/ida/ctype_propagation.py | 2 | ||||
| -rw-r--r-- | miasm2/analysis/data_analysis.py | 2 | ||||
| -rw-r--r-- | miasm2/ir/ir.py | 10 | ||||
| -rw-r--r-- | miasm2/ir/symbexec.py | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py index 27b0512f..2552b28f 100644 --- a/example/expression/solve_condition_stp.py +++ b/example/expression/solve_condition_stp.py @@ -39,7 +39,7 @@ def get_block(ir_arch, mdis, ad): ad = l.offset b = mdis.dis_bloc(ad) ir_arch.add_bloc(b) - b = ir_arch.get_bloc(l) + b = ir_arch.get_block(l) if b is None: raise LookupError('no block found at that address: %s' % l) return b diff --git a/example/ida/ctype_propagation.py b/example/ida/ctype_propagation.py index f4fdc3b5..808228e3 100644 --- a/example/ida/ctype_propagation.py +++ b/example/ida/ctype_propagation.py @@ -62,7 +62,7 @@ def get_block(ir_arch, mdis, addr): if not lbl in ir_arch.blocks: block = mdis.dis_bloc(lbl.offset) ir_arch.add_bloc(block) - irblock = ir_arch.get_bloc(lbl) + irblock = ir_arch.get_block(lbl) if irblock is None: raise LookupError('No block found at that address: %s' % lbl) return irblock diff --git a/miasm2/analysis/data_analysis.py b/miasm2/analysis/data_analysis.py index c745b6c7..b3e15ca6 100644 --- a/miasm2/analysis/data_analysis.py +++ b/miasm2/analysis/data_analysis.py @@ -221,7 +221,7 @@ class symb_exec_func: variables = dict(state.symbols.items()) # get bloc dead, and remove from state - b = self.ir_arch.get_bloc(ad) + b = self.ir_arch.get_block(ad) if b is None: raise ValueError("unknown bloc! %s" % ad) """ diff --git a/miasm2/ir/ir.py b/miasm2/ir/ir.py index 7c39cf04..67881ae6 100644 --- a/miasm2/ir/ir.py +++ b/miasm2/ir/ir.py @@ -477,13 +477,21 @@ class IntermediateRepresentation(object): addr = self.symbol_pool.getby_name_create(addr.name) return addr - def get_bloc(self, addr): + def get_block(self, addr): """Returns the irbloc associated to an ExprId/ExprInt/label/int @addr: an ExprId/ExprInt/label/int""" label = self.get_label(addr) return self.blocks.get(label, None) + def get_bloc(self, addr): + """ + DEPRECATED function + Use get_block instead of get_block + """ + warnings.warn('DEPRECATION WARNING: use "get_block" instead of "get_bloc"') + return self.get_block(addr) + def add_instr(self, line, addr=0, gen_pc_updt=False): block = AsmBlock(self.gen_label()) block.lines = [line] diff --git a/miasm2/ir/symbexec.py b/miasm2/ir/symbexec.py index e98744c0..6d6ba630 100644 --- a/miasm2/ir/symbexec.py +++ b/miasm2/ir/symbexec.py @@ -530,7 +530,7 @@ class SymbolicExecutionEngine(object): return self.emul_ir_block(addr, step) def emul_ir_block(self, addr, step=False): - irblock = self.ir_arch.get_bloc(addr) + irblock = self.ir_arch.get_block(addr) if irblock is not None: addr = self.emulbloc(irblock, step=step) return addr @@ -541,7 +541,7 @@ class SymbolicExecutionEngine(object): def emul_ir_blocks(self, addr, lbl_stop=None, step=False): while True: - irblock = self.ir_arch.get_bloc(addr) + irblock = self.ir_arch.get_block(addr) if irblock is None: break if irblock.label == lbl_stop: |