diff options
Diffstat (limited to 'miasm2/analysis')
| -rw-r--r-- | miasm2/analysis/binary.py | 2 | ||||
| -rw-r--r-- | miasm2/analysis/depgraph.py | 2 | ||||
| -rw-r--r-- | miasm2/analysis/disasm_cb.py | 4 | ||||
| -rw-r--r-- | miasm2/analysis/dse.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py index ae3b964e..16e573bb 100644 --- a/miasm2/analysis/binary.py +++ b/miasm2/analysis/binary.py @@ -217,7 +217,7 @@ class ContainerELF(Container): log.warning("Same offset (%s) for %s and %s", (hex(offset), name, - self._loc_db.getby_offset(offset))) + self._loc_db.get_offset_location(offset))) continue diff --git a/miasm2/analysis/depgraph.py b/miasm2/analysis/depgraph.py index 6532a3ef..f5a2b043 100644 --- a/miasm2/analysis/depgraph.py +++ b/miasm2/analysis/depgraph.py @@ -298,7 +298,7 @@ class DependencyResult(DependencyState): # Eval the block loc_db = LocationDB() - temp_loc = loc_db.getby_name_create("Temp") + temp_loc = loc_db.get_or_create_name_location("Temp") symb_exec = SymbolicExecutionEngine(self._ira, ctx_init) symb_exec.eval_updt_irblock(IRBlock(temp_loc, assignblks), step=step) diff --git a/miasm2/analysis/disasm_cb.py b/miasm2/analysis/disasm_cb.py index 54832104..bb8223e8 100644 --- a/miasm2/analysis/disasm_cb.py +++ b/miasm2/analysis/disasm_cb.py @@ -49,7 +49,7 @@ def arm_guess_subcall( l = cur_bloc.lines[-1] if lr_val.arg != l.offset + l.l: continue - l = loc_db.getby_offset_create(int(lr_val)) + l = loc_db.get_or_create_offset_location(int(lr_val)) c = AsmConstraintNext(l) to_add.add(c) @@ -111,7 +111,7 @@ def arm_guess_jump_table( for ad in addrs: offsets_to_dis.add(ad) - l = loc_db.getby_offset_create(ad) + l = loc_db.get_or_create_offset_location(ad) c = AsmConstraintTo(l) cur_bloc.addto(c) diff --git a/miasm2/analysis/dse.py b/miasm2/analysis/dse.py index e2758d6c..87d11e0a 100644 --- a/miasm2/analysis/dse.py +++ b/miasm2/analysis/dse.py @@ -348,7 +348,7 @@ class DSEEngine(object): self.symb.run_block_at(cur_addr) if not (isinstance(next_addr_concrete, ExprLoc) and - self.ir_arch.loc_db.loc_key_to_offset( + self.ir_arch.loc_db.get_location_offset( next_addr_concrete.loc_key ) is None): # Not a lbl_gen, exit |