diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/__init__.py | 65 | ||||
| -rw-r--r-- | python/examples/nes.py | 8 |
2 files changed, 54 insertions, 19 deletions
diff --git a/python/__init__.py b/python/__init__.py index d45cd30f..bf2ebfaa 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -2168,6 +2168,23 @@ class Function(object): return result @property + def lifted_il(self): + """Function lifted IL (read-only)""" + return LowLevelILFunction(self.arch, core.BNNewLowLevelILFunctionReference( + core.BNGetFunctionLiftedIL(self.handle))) + + @property + def lifted_il_basic_blocks(self): + """Function lifted IL basic blocks (read-only)""" + count = ctypes.c_ulonglong() + blocks = core.BNGetFunctionLiftedILBasicBlockList(self.handle, count) + result = [] + for i in xrange(0, count.value): + result.append(BasicBlock(self._view, core.BNNewBasicBlockReference(blocks[i]))) + core.BNFreeBasicBlockList(blocks, count.value) + return result + + @property def type(self): """Function type (read-only)""" return Type(core.BNGetFunctionType(self.handle)) @@ -2281,40 +2298,43 @@ class Function(object): core.BNFreeStackVariableReferenceList(refs, count.value) return result - def get_low_level_il_flag_uses_for_definition(self, i, flag): + def get_lifted_il_at(self, arch, addr): + return core.BNGetLiftedILForInstruction(self.handle, arch.handle, addr) + + def get_lifted_il_flag_uses_for_definition(self, i, flag): if isinstance(flag, str): flag = self.arch._flags[flag] count = ctypes.c_ulonglong() - instrs = core.BNGetLowLevelILFlagUsesForDefinition(self.handle, i, flag, count) + instrs = core.BNGetLiftedILFlagUsesForDefinition(self.handle, i, flag, count) result = [] for i in xrange(0, count.value): result.append(instrs[i]) core.BNFreeLowLevelILInstructionList(instrs) return result - def get_low_level_il_flag_definitions_for_use(self, i, flag): + def get_lifted_il_flag_definitions_for_use(self, i, flag): if isinstance(flag, str): flag = self.arch._flags[flag] count = ctypes.c_ulonglong() - instrs = core.BNGetLowLevelILFlagDefinitionsForUse(self.handle, i, flag, count) + instrs = core.BNGetLiftedILFlagDefinitionsForUse(self.handle, i, flag, count) result = [] for i in xrange(0, count.value): result.append(instrs[i]) core.BNFreeLowLevelILInstructionList(instrs) return result - def get_flags_read_by_low_level_il_instruction(self, i): + def get_flags_read_by_lifted_il_instruction(self, i): count = ctypes.c_ulonglong() - flags = core.BNGetFlagsReadByLowLevelILInstruction(self.handle, i, count) + flags = core.BNGetFlagsReadByLiftedILInstruction(self.handle, i, count) result = [] for i in xrange(0, count.value): result.append(self.arch._flags_by_index[flags[i]]) core.BNFreeRegisterList(flags) return result - def get_flags_written_by_low_level_il_instruction(self, i): + def get_flags_written_by_lifted_il_instruction(self, i): count = ctypes.c_ulonglong() - flags = core.BNGetFlagsWrittenByLowLevelILInstruction(self.handle, i, count) + flags = core.BNGetFlagsWrittenByLiftedILInstruction(self.handle, i, count) result = [] for i in xrange(0, count.value): result.append(self.arch._flags_by_index[flags[i]]) @@ -3283,19 +3303,22 @@ class Architecture(object): count[0] = 0 return None - def _get_flag_write_low_level_il(self, ctxt, op, size, write_type, operands, operand_count, il): + def _get_flag_write_low_level_il(self, ctxt, op, size, write_type, flag, operands, operand_count, il): try: write_type_name = None if write_type != 0: write_type_name = self._flag_write_types_by_index[write_type] + flag_name = self._flags_by_index[flag] operand_list = [] for i in xrange(operand_count): if operands[i].constant: - operand_list.append(operands[i].value) + operand_list.append(("const", operands[i].value)) + elif LLIL_REG_IS_TEMP(operands[i].reg): + operand_list.append(("reg", operands[i].reg)) else: - operand_list.append(self._regs_by_index[operands[i].reg]) - return self.perform_get_flag_write_low_level_il(op, size, write_type_name, operand_list, - LowLevelILFunction(self, core.BNNewLowLevelILFunctionReference(il))) + operand_list.append(("reg", self._regs_by_index[operands[i].reg])) + return self.perform_get_flag_write_low_level_il(op, size, write_type_name, flag_name, operand_list, + LowLevelILFunction(self, core.BNNewLowLevelILFunctionReference(il))).index except: log_error(traceback.format_exc()) return False @@ -3303,7 +3326,7 @@ class Architecture(object): def _get_flag_condition_low_level_il(self, ctxt, cond, il): try: return self.perform_get_flag_condition_low_level_il(cond, - LowLevelILFunction(self, core.BNNewLowLevelILFunctionReference(il))) + LowLevelILFunction(self, core.BNNewLowLevelILFunctionReference(il))).index except: log_error(traceback.format_exc()) return 0 @@ -3484,8 +3507,8 @@ class Architecture(object): def perform_get_instruction_low_level_il(self, data, addr, il): return None - def perform_get_flag_write_low_level_il(self, op, size, write_type, operands, il): - return False + def perform_get_flag_write_low_level_il(self, op, size, write_type, flag, operands, il): + return il.unimplemented() def perform_get_flag_condition_low_level_il(self, cond, il): return il.unimplemented() @@ -3945,6 +3968,16 @@ class LowLevelILFunction(object): def current_address(self, value): core.BNLowLevelILSetCurrentAddress(self.handle, value) + @property + def temp_reg_count(self): + """Number of temporary registers (read-only)""" + return core.BNGetLowLevelILTemporaryRegisterCount(self.handle) + + @property + def temp_flag_count(self): + """Number of temporary flags (read-only)""" + return core.BNGetLowLevelILTemporaryFlagCount(self.handle) + def __setattr__(self, name, value): try: object.__setattr__(self,name,value) diff --git a/python/examples/nes.py b/python/examples/nes.py index 8d3d9269..21b02dfa 100644 --- a/python/examples/nes.py +++ b/python/examples/nes.py @@ -291,9 +291,9 @@ InstructionIL = { "bcs": lambda il, operand: cond_branch(il, il.flag_condition(LLFC_ULT), operand), "beq": lambda il, operand: cond_branch(il, il.flag_condition(LLFC_E), operand), "bit": lambda il, operand: il.and_expr(1, il.reg(1, "a"), operand, flags = "czs"), - "bmi": lambda il, operand: cond_branch(il, il.flag("s"), operand), + "bmi": lambda il, operand: cond_branch(il, il.flag_condition(LLFC_NEG), operand), "bne": lambda il, operand: cond_branch(il, il.flag_condition(LLFC_NE), operand), - "bpl": lambda il, operand: cond_branch(il, il.not_expr(0, il.flag("s")), operand), + "bpl": lambda il, operand: cond_branch(il, il.flag_condition(LLFC_POS), operand), "brk": lambda il, operand: il.system_call(), "bvc": lambda il, operand: cond_branch(il, il.not_expr(0, il.flag("v")), operand), "bvs": lambda il, operand: cond_branch(il, il.flag("v"), operand), @@ -368,7 +368,9 @@ class M6502(Architecture): LLFC_UGE: ["c"], LLFC_ULT: ["c"], LLFC_E: ["z"], - LLFC_NE: ["z"] + LLFC_NE: ["z"], + LLFC_NEG: ["s"], + LLFC_POS: ["s"] } flags_written_by_flag_write_type = { "*": ["c", "z", "v", "s"], |