From 3ab807811a7efdcfeff4be101822be9d383c15e1 Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Sun, 8 May 2016 23:46:20 -0400 Subject: Add additional IL stage for flags resolution --- binaryninjaapi.h | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'binaryninjaapi.h') diff --git a/binaryninjaapi.h b/binaryninjaapi.h index 977727e8..97caebb6 100644 --- a/binaryninjaapi.h +++ b/binaryninjaapi.h @@ -1008,8 +1008,8 @@ namespace BinaryNinja static BNFlagRole GetFlagRoleCallback(void* ctxt, uint32_t flag); static uint32_t* GetFlagsRequiredForFlagConditionCallback(void* ctxt, BNLowLevelILFlagCondition cond, size_t* count); static uint32_t* GetFlagsWrittenByFlagWriteTypeCallback(void* ctxt, uint32_t writeType, size_t* count); - static bool GetFlagWriteLowLevelILCallback(void* ctxt, BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, - BNRegisterOrConstant* operands, size_t operandCount, BNLowLevelILFunction* il); + static size_t GetFlagWriteLowLevelILCallback(void* ctxt, BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, + uint32_t flag, BNRegisterOrConstant* operands, size_t operandCount, BNLowLevelILFunction* il); static size_t GetFlagConditionLowLevelILCallback(void* ctxt, BNLowLevelILFlagCondition cond, BNLowLevelILFunction* il); static void FreeRegisterListCallback(void* ctxt, uint32_t* regs); @@ -1058,8 +1058,10 @@ namespace BinaryNinja virtual BNFlagRole GetFlagRole(uint32_t flag); virtual std::vector GetFlagsRequiredForFlagCondition(BNLowLevelILFlagCondition cond); virtual std::vector GetFlagsWrittenByFlagWriteType(uint32_t writeType); - virtual bool GetFlagWriteLowLevelIL(BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, - BNRegisterOrConstant* operands, size_t operandCount, LowLevelILFunction& il); + virtual ExprId GetFlagWriteLowLevelIL(BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, + uint32_t flag, BNRegisterOrConstant* operands, size_t operandCount, LowLevelILFunction& il); + ExprId GetDefaultFlagWriteLowLevelIL(BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, + uint32_t flag, BNRegisterOrConstant* operands, size_t operandCount, LowLevelILFunction& il); virtual ExprId GetFlagConditionLowLevelIL(BNLowLevelILFlagCondition cond, LowLevelILFunction& il); virtual BNRegisterInfo GetRegisterInfo(uint32_t reg); virtual uint32_t GetStackPointerRegister(); @@ -1132,8 +1134,8 @@ namespace BinaryNinja virtual BNFlagRole GetFlagRole(uint32_t flag) override; virtual std::vector GetFlagsRequiredForFlagCondition(BNLowLevelILFlagCondition cond) override; virtual std::vector GetFlagsWrittenByFlagWriteType(uint32_t writeType) override; - virtual bool GetFlagWriteLowLevelIL(BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, - BNRegisterOrConstant* operands, size_t operandCount, LowLevelILFunction& il) override; + virtual ExprId GetFlagWriteLowLevelIL(BNLowLevelILOperation op, size_t size, uint32_t flagWriteType, + uint32_t flag, BNRegisterOrConstant* operands, size_t operandCount, LowLevelILFunction& il) override; virtual ExprId GetFlagConditionLowLevelIL(BNLowLevelILFlagCondition cond, LowLevelILFunction& il) override; virtual BNRegisterInfo GetRegisterInfo(uint32_t reg) override; virtual uint32_t GetStackPointerRegister() override; @@ -1344,10 +1346,13 @@ namespace BinaryNinja std::vector GetRegistersWrittenByInstruction(Architecture* arch, uint64_t addr); std::vector GetStackVariablesReferencedByInstruction(Architecture* arch, uint64_t addr); - std::set GetLowLevelILFlagUsesForDefinition(size_t i, uint32_t flag); - std::set GetLowLevelILFlagDefinitionsForUse(size_t i, uint32_t flag); - std::set GetFlagsReadByLowLevelILInstruction(size_t i); - std::set GetFlagsWrittenByLowLevelILInstruction(size_t i); + Ref GetLiftedIL() const; + std::vector> GetLiftedILBasicBlocks() const; + size_t GetLiftedILForInstruction(Architecture* arch, uint64_t addr); + std::set GetLiftedILFlagUsesForDefinition(size_t i, uint32_t flag); + std::set GetLiftedILFlagDefinitionsForUse(size_t i, uint32_t flag); + std::set GetFlagsReadByLiftedILInstruction(size_t i); + std::set GetFlagsWrittenByLiftedILInstruction(size_t i); Ref GetType() const; void ApplyImportedTypes(Symbol* sym); @@ -1545,6 +1550,9 @@ namespace BinaryNinja bool GetExprText(Architecture* arch, ExprId expr, std::vector& tokens); bool GetInstructionText(Architecture* arch, size_t i, std::vector& tokens); + + uint32_t GetTemporaryRegisterCount(); + uint32_t GetTemporaryFlagCount(); }; class FunctionRecognizer -- cgit v1.3.1