Add classes and groups for semantic flags resolution

1 files changed, 55 insertions, 4 deletions

diff --git a/lowlevelilinstruction.cpp b/lowlevelilinstruction.cpp
index 611bd431..61a02834 100644
--- a/lowlevelilinstruction.cpp
+++ b/lowlevelilinstruction.cpp
@@ -49,6 +49,8 @@ unordered_map<LowLevelILOperandUsage, LowLevelILOperandType>
 		{DestSSARegisterLowLevelOperandUsage, SSARegisterLowLevelOperand},
 		{DestSSARegisterStackLowLevelOperandUsage, SSARegisterStackLowLevelOperand},
 		{DestSSAFlagLowLevelOperandUsage, SSAFlagLowLevelOperand},
+		{SemanticFlagClassLowLevelOperandUsage, SemanticFlagClassLowLevelOperand},
+		{SemanticFlagGroupLowLevelOperandUsage, SemanticFlagGroupLowLevelOperand},
 		{PartialRegisterLowLevelOperandUsage, RegisterLowLevelOperand},
 		{PartialSSARegisterStackSourceLowLevelOperandUsage, SSARegisterStackLowLevelOperand},
 		{StackSSARegisterLowLevelOperandUsage, SSARegisterLowLevelOperand},
@@ -140,7 +142,8 @@ unordered_map<BNLowLevelILOperation, vector<LowLevelILOperandUsage>>
 		{LLIL_IF, {ConditionExprLowLevelOperandUsage, TrueTargetLowLevelOperandUsage,
 			FalseTargetLowLevelOperandUsage}},
 		{LLIL_GOTO, {TargetLowLevelOperandUsage}},
-		{LLIL_FLAG_COND, {FlagConditionLowLevelOperandUsage}},
+		{LLIL_FLAG_COND, {FlagConditionLowLevelOperandUsage, SemanticFlagClassLowLevelOperandUsage}},
+		{LLIL_FLAG_GROUP, {SemanticFlagGroupLowLevelOperandUsage}},
 		{LLIL_TRAP, {VectorLowLevelOperandUsage}},
 		{LLIL_CALL_SSA, {OutputSSARegistersLowLevelOperandUsage, OutputMemoryVersionLowLevelOperandUsage,
 			DestExprLowLevelOperandUsage, StackSSARegisterLowLevelOperandUsage,
@@ -887,6 +890,22 @@ BNLowLevelILFlagCondition LowLevelILOperand::GetFlagCondition() const
 }
 
 
+uint32_t LowLevelILOperand::GetSemanticFlagClass() const
+{
+	if (m_type != SemanticFlagClassLowLevelOperand)
+		throw LowLevelILInstructionAccessException();
+	return m_instr.GetRawOperandAsRegister(m_operandIndex);
+}
+
+
+uint32_t LowLevelILOperand::GetSemanticFlagGroup() const
+{
+	if (m_type != SemanticFlagGroupLowLevelOperand)
+		throw LowLevelILInstructionAccessException();
+	return m_instr.GetRawOperandAsRegister(m_operandIndex);
+}
+
+
 SSARegister LowLevelILOperand::GetSSARegister() const
 {
 	if (m_type != SSARegisterLowLevelOperand)
@@ -1711,7 +1730,9 @@ ExprId LowLevelILInstruction::CopyTo(LowLevelILFunction* dest,
 			return dest->Undefined(*this);
 		return dest->If(subExprHandler(GetConditionExpr<LLIL_IF>()), *labelA, *labelB, *this);
 	case LLIL_FLAG_COND:
-		return dest->FlagCondition(GetFlagCondition<LLIL_FLAG_COND>(), *this);
+		return dest->FlagCondition(GetFlagCondition<LLIL_FLAG_COND>(), GetSemanticFlagClass<LLIL_FLAG_COND>(), *this);
+	case LLIL_FLAG_GROUP:
+		return dest->FlagGroup(GetSemanticFlagGroup<LLIL_FLAG_GROUP>(), *this);
 	case LLIL_TRAP:
 		return dest->Trap(GetVector<LLIL_TRAP>(), *this);
 	case LLIL_CALL_SSA:
@@ -1965,6 +1986,24 @@ SSAFlag LowLevelILInstruction::GetDestSSAFlag() const
 }
 
 
+uint32_t LowLevelILInstruction::GetSemanticFlagClass() const
+{
+	size_t operandIndex;
+	if (GetOperandIndexForUsage(SemanticFlagClassLowLevelOperandUsage, operandIndex))
+		return GetRawOperandAsRegister(operandIndex);
+	throw LowLevelILInstructionAccessException();
+}
+
+
+uint32_t LowLevelILInstruction::GetSemanticFlagGroup() const
+{
+	size_t operandIndex;
+	if (GetOperandIndexForUsage(SemanticFlagGroupLowLevelOperandUsage, operandIndex))
+		return GetRawOperandAsRegister(operandIndex);
+	throw LowLevelILInstructionAccessException();
+}
+
+
 uint32_t LowLevelILInstruction::GetPartialRegister() const
 {
 	size_t operandIndex;
@@ -2749,9 +2788,15 @@ ExprId LowLevelILFunction::NoReturn(const ILSourceLocation& loc)
 }
 
 
-ExprId LowLevelILFunction::FlagCondition(BNLowLevelILFlagCondition cond, const ILSourceLocation& loc)
+ExprId LowLevelILFunction::FlagCondition(BNLowLevelILFlagCondition cond, uint32_t semClass, const ILSourceLocation& loc)
 {
-	return AddExprWithLocation(LLIL_FLAG_COND, loc, 0, 0, (ExprId)cond);
+	return AddExprWithLocation(LLIL_FLAG_COND, loc, 0, 0, (ExprId)cond, semClass);
+}
+
+
+ExprId LowLevelILFunction::FlagGroup(uint32_t semGroup, const ILSourceLocation& loc)
+{
+	return AddExprWithLocation(LLIL_FLAG_GROUP, loc, 0, 0, semGroup);
 }
 
 
@@ -2989,6 +3034,12 @@ ExprId LowLevelILFunction::FloatCompareGreaterThan(size_t size, ExprId a, ExprId
 }
 
 
+ExprId LowLevelILFunction::FloatCompareOrdered(size_t size, ExprId a, ExprId b, const ILSourceLocation& loc)
+{
+	return AddExprWithLocation(LLIL_FCMP_O, loc, size, 0, a, b);
+}
+
+
 ExprId LowLevelILFunction::FloatCompareUnordered(size_t size, ExprId a, ExprId b, const ILSourceLocation& loc)
 {
 	return AddExprWithLocation(LLIL_FCMP_UO, loc, size, 0, a, b);