diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/lowlevelil.py | 15 | ||||
| -rw-r--r-- | python/mediumlevelil.py | 11 |
2 files changed, 16 insertions, 10 deletions
diff --git a/python/lowlevelil.py b/python/lowlevelil.py index e759ef09..2609f761 100644 --- a/python/lowlevelil.py +++ b/python/lowlevelil.py @@ -873,6 +873,9 @@ class LowLevelILFunction(object): raise IndexError("expected integer instruction index") if isinstance(i, LowLevelILExpr): return LowLevelILInstruction(self, i.index) + # for backwards compatibility + if isinstance(i, LowLevelILInstruction): + return i if (i < 0) or (i >= len(self)): raise IndexError("index out of range") return LowLevelILInstruction(self, core.BNGetLowLevelILIndexForInstruction(self.handle, i), i) @@ -2308,20 +2311,20 @@ class LowLevelILFunction(object): result = core.BNGetLowLevelILSSARegisterDefinition(self.handle, reg, reg_ssa.version) if result >= core.BNGetLowLevelILInstructionCount(self.handle): return None - return result + return self[result] def get_ssa_flag_definition(self, flag_ssa): flag = self.arch.get_flag_index(flag_ssa.flag) result = core.BNGetLowLevelILSSAFlagDefinition(self.handle, flag, flag_ssa.version) if result >= core.BNGetLowLevelILInstructionCount(self.handle): return None - return result + return self[result] def get_ssa_memory_definition(self, index): result = core.BNGetLowLevelILSSAMemoryDefinition(self.handle, index) if result >= core.BNGetLowLevelILInstructionCount(self.handle): return None - return result + return self[result] def get_ssa_reg_uses(self, reg_ssa): reg = self.arch.get_reg_index(reg_ssa.reg) @@ -2329,7 +2332,7 @@ class LowLevelILFunction(object): instrs = core.BNGetLowLevelILSSARegisterUses(self.handle, reg, reg_ssa.version, count) result = [] for i in range(0, count.value): - result.append(instrs[i]) + result.append(self[instrs[i]]) core.BNFreeILInstructionList(instrs) return result @@ -2339,7 +2342,7 @@ class LowLevelILFunction(object): instrs = core.BNGetLowLevelILSSAFlagUses(self.handle, flag, flag_ssa.version, count) result = [] for i in range(0, count.value): - result.append(instrs[i]) + result.append(self[instrs[i]]) core.BNFreeILInstructionList(instrs) return result @@ -2348,7 +2351,7 @@ class LowLevelILFunction(object): instrs = core.BNGetLowLevelILSSAMemoryUses(self.handle, index, count) result = [] for i in range(0, count.value): - result.append(instrs[i]) + result.append(self[instrs[i]]) core.BNFreeILInstructionList(instrs) return result diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py index 4559d7b6..d997fa76 100644 --- a/python/mediumlevelil.py +++ b/python/mediumlevelil.py @@ -728,6 +728,9 @@ class MediumLevelILFunction(object): raise IndexError("expected integer instruction index") if isinstance(i, MediumLevelILExpr): return MediumLevelILInstruction(self, i.index) + # for backwards compatibility + if isinstance(i, MediumLevelILInstruction): + return i if (i < 0) or (i >= len(self)): raise IndexError("index out of range") return MediumLevelILInstruction(self, core.BNGetMediumLevelILIndexForInstruction(self.handle, i), i) @@ -864,13 +867,13 @@ class MediumLevelILFunction(object): result = core.BNGetMediumLevelILSSAVarDefinition(self.handle, var_data, ssa_var.version) if result >= core.BNGetMediumLevelILInstructionCount(self.handle): return None - return result + return self[result] def get_ssa_memory_definition(self, version): result = core.BNGetMediumLevelILSSAMemoryDefinition(self.handle, version) if result >= core.BNGetMediumLevelILInstructionCount(self.handle): return None - return result + return self[result] def get_ssa_var_uses(self, ssa_var): count = ctypes.c_ulonglong() @@ -881,7 +884,7 @@ class MediumLevelILFunction(object): instrs = core.BNGetMediumLevelILSSAVarUses(self.handle, var_data, ssa_var.version, count) result = [] for i in range(0, count.value): - result.append(instrs[i]) + result.append(self[instrs[i]]) core.BNFreeILInstructionList(instrs) return result @@ -890,7 +893,7 @@ class MediumLevelILFunction(object): instrs = core.BNGetMediumLevelILSSAMemoryUses(self.handle, version, count) result = [] for i in range(0, count.value): - result.append(instrs[i]) + result.append(self[instrs[i]]) core.BNFreeILInstructionList(instrs) return result |