diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2017-07-20 19:35:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 19:35:49 +0200 |
| commit | 4dfca940e75ad8af65b69dd9bab9ff503141984b (patch) | |
| tree | aad96a02c272397eae9fd7377ea86a713814516a /miasm2/analysis | |
| parent | e45256e15c62aba315ab1e2db5697a14837f5827 (diff) | |
| parent | 4fcd0faa925d8d33db3622430548e932443d6f02 (diff) | |
| download | miasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.tar.gz miasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.zip | |
Merge pull request #579 from serpilliere/fix_get_bloc
Fix get bloc
Diffstat (limited to 'miasm2/analysis')
| -rw-r--r-- | miasm2/analysis/data_analysis.py | 2 | ||||
| -rw-r--r-- | miasm2/analysis/disasm_cb.py | 4 | ||||
| -rw-r--r-- | miasm2/analysis/dse.py | 4 |
3 files changed, 5 insertions, 5 deletions
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/analysis/disasm_cb.py b/miasm2/analysis/disasm_cb.py index f6385c9c..9a75603f 100644 --- a/miasm2/analysis/disasm_cb.py +++ b/miasm2/analysis/disasm_cb.py @@ -29,7 +29,7 @@ def arm_guess_subcall( ir_arch = ira(sp) print '###' print cur_bloc - ir_arch.add_bloc(cur_bloc) + ir_arch.add_block(cur_bloc) ir_blocks = ir_arch.blocks.values() # flow_graph = DiGraph() @@ -76,7 +76,7 @@ def arm_guess_jump_table( sp = AsmSymbolPool() ir_arch = ira(sp) - ir_arch.add_bloc(cur_bloc) + ir_arch.add_block(cur_bloc) ir_blocks = ir_arch.blocks.values() for irblock in ir_blocks: diff --git a/miasm2/analysis/dse.py b/miasm2/analysis/dse.py index 56ed3292..329323e2 100644 --- a/miasm2/analysis/dse.py +++ b/miasm2/analysis/dse.py @@ -301,8 +301,8 @@ class DSEEngine(object): self.ir_arch.blocks.clear()# = {} ## Update current state - asm_block = self.mdis.dis_bloc(cur_addr) - self.ir_arch.add_bloc(asm_block) + asm_block = self.mdis.dis_block(cur_addr) + self.ir_arch.add_block(asm_block) self.addr_to_cacheblocks[cur_addr] = dict(self.ir_arch.blocks) # Emulate the current instruction |