Format All Files

1 files changed, 652 insertions, 239 deletions

diff --git a/highlevelilinstruction.h b/highlevelilinstruction.h
index 763c8221..6947479c 100644
--- a/highlevelilinstruction.h
+++ b/highlevelilinstruction.h
@@ -24,9 +24,9 @@
 #include <unordered_map>
 #include <vector>
 #ifdef BINARYNINJACORE_LIBRARY
-#include "variable.h"
+	#include "variable.h"
 #else
-#include "binaryninjaapi.h"
+	#include "binaryninjaapi.h"
 #endif
 #include "mediumlevelilinstruction.h"
 
@@ -39,7 +39,8 @@ namespace BinaryNinja
 	class HighLevelILFunction;
 
 	template <BNHighLevelILOperation N>
-	struct HighLevelILInstructionAccessor {};
+	struct HighLevelILInstructionAccessor
+	{};
 
 	struct HighLevelILInstruction;
 	struct HighLevelILConstantInstruction;
@@ -103,24 +104,23 @@ namespace BinaryNinja
 		SourceMemoryVersionsHighLevelOperandUsage,
 		DestMemoryVersionHighLevelOperandUsage
 	};
-}
+}  // namespace BinaryNinjaCore
 
-namespace std
-{
-	template<> struct hash<BNHighLevelILOperation>
+namespace std {
+	template <>
+	struct hash<BNHighLevelILOperation>
 	{
 		typedef BNHighLevelILOperation argument_type;
 		typedef int result_type;
-		result_type operator()(argument_type const& value) const
-		{
-			return (result_type)value;
-		}
+		result_type operator()(argument_type const& value) const { return (result_type)value; }
 	};
 
 #ifdef BINARYNINJACORE_LIBRARY
-	template<> struct hash<BinaryNinjaCore::HighLevelILOperandUsage>
+	template <>
+	struct hash<BinaryNinjaCore::HighLevelILOperandUsage>
 #else
-	template<> struct hash<BinaryNinja::HighLevelILOperandUsage>
+	template <>
+	struct hash<BinaryNinja::HighLevelILOperandUsage>
 #endif
 	{
 #ifdef BINARYNINJACORE_LIBRARY
@@ -129,12 +129,9 @@ namespace std
 		typedef BinaryNinja::HighLevelILOperandUsage argument_type;
 #endif
 		typedef int result_type;
-		result_type operator()(argument_type const& value) const
-		{
-			return (result_type)value;
-		}
+		result_type operator()(argument_type const& value) const { return (result_type)value; }
 	};
-}
+}  // namespace std
 
 #ifdef BINARYNINJACORE_LIBRARY
 namespace BinaryNinjaCore
@@ -143,19 +140,19 @@ namespace BinaryNinja
 #endif
 {
 #ifdef BINARYNINJACORE_LIBRARY
-#define _STD_VECTOR vector
-#define _STD_SET set
-#define _STD_UNORDERED_MAP unordered_map
+	#define _STD_VECTOR        vector
+	#define _STD_SET           set
+	#define _STD_UNORDERED_MAP unordered_map
 #else
-#define _STD_VECTOR std::vector
-#define _STD_SET std::set
-#define _STD_UNORDERED_MAP std::unordered_map
+	#define _STD_VECTOR        std::vector
+	#define _STD_SET           std::set
+	#define _STD_UNORDERED_MAP std::unordered_map
 #endif
 
-	class HighLevelILInstructionAccessException: public std::exception
+	class HighLevelILInstructionAccessException : public std::exception
 	{
-	public:
-		HighLevelILInstructionAccessException(): std::exception() {}
+	  public:
+		HighLevelILInstructionAccessException() : std::exception() {}
 		virtual const char* what() const NOEXCEPT { return "invalid access to HLIL instruction"; }
 	};
 
@@ -181,7 +178,7 @@ namespace BinaryNinja
 
 		ListIterator m_start;
 
-	public:
+	  public:
 		typedef ListIterator const_iterator;
 
 		HighLevelILIntegerList(HighLevelILFunction* func, const BNHighLevelILInstruction& instr, size_t count);
@@ -202,13 +199,17 @@ namespace BinaryNinja
 			bool operator==(const ListIterator& a) const { return pos == a.pos; }
 			bool operator!=(const ListIterator& a) const { return pos != a.pos; }
 			bool operator<(const ListIterator& a) const { return pos < a.pos; }
-			ListIterator& operator++() { ++pos; return *this; }
+			ListIterator& operator++()
+			{
+				++pos;
+				return *this;
+			}
 			size_t operator*();
 		};
 
 		HighLevelILIntegerList m_list;
 
-	public:
+	  public:
 		typedef ListIterator const_iterator;
 
 		HighLevelILIndexList(HighLevelILFunction* func, const BNHighLevelILInstruction& instr, size_t count);
@@ -231,7 +232,11 @@ namespace BinaryNinja
 			bool operator==(const ListIterator& a) const { return pos == a.pos; }
 			bool operator!=(const ListIterator& a) const { return pos != a.pos; }
 			bool operator<(const ListIterator& a) const { return pos < a.pos; }
-			ListIterator& operator++() { ++pos; return *this; }
+			ListIterator& operator++()
+			{
+				++pos;
+				return *this;
+			}
 			const HighLevelILInstruction operator*();
 		};
 
@@ -239,11 +244,11 @@ namespace BinaryNinja
 		bool m_ast;
 		size_t m_instructionIndex;
 
-	public:
+	  public:
 		typedef ListIterator const_iterator;
 
-		HighLevelILInstructionList(HighLevelILFunction* func, const BNHighLevelILInstruction& instr,
-			size_t count, bool asFullAst, size_t instructionIndex);
+		HighLevelILInstructionList(HighLevelILFunction* func, const BNHighLevelILInstruction& instr, size_t count,
+		    bool asFullAst, size_t instructionIndex);
 
 		const_iterator begin() const;
 		const_iterator end() const;
@@ -261,13 +266,18 @@ namespace BinaryNinja
 			bool operator==(const ListIterator& a) const { return pos == a.pos; }
 			bool operator!=(const ListIterator& a) const { return pos != a.pos; }
 			bool operator<(const ListIterator& a) const { return pos < a.pos; }
-			ListIterator& operator++() { ++pos; ++pos; return *this; }
+			ListIterator& operator++()
+			{
+				++pos;
+				++pos;
+				return *this;
+			}
 			const SSAVariable operator*();
 		};
 
 		HighLevelILIntegerList m_list;
 
-	public:
+	  public:
 		typedef ListIterator const_iterator;
 
 		HighLevelILSSAVariableList(HighLevelILFunction* func, const BNHighLevelILInstruction& instr, size_t count);
@@ -280,7 +290,7 @@ namespace BinaryNinja
 		operator _STD_VECTOR<SSAVariable>() const;
 	};
 
-	struct HighLevelILInstructionBase: public BNHighLevelILInstruction
+	struct HighLevelILInstructionBase : public BNHighLevelILInstruction
 	{
 #ifdef BINARYNINJACORE_LIBRARY
 		HighLevelILFunction* function;
@@ -291,10 +301,9 @@ namespace BinaryNinja
 		bool ast;
 
 		static _STD_UNORDERED_MAP<HighLevelILOperandUsage, HighLevelILOperandType> operandTypeForUsage;
-		static _STD_UNORDERED_MAP<BNHighLevelILOperation,
-			_STD_VECTOR<HighLevelILOperandUsage>> operationOperandUsage;
-		static _STD_UNORDERED_MAP<BNHighLevelILOperation,
-			_STD_UNORDERED_MAP<HighLevelILOperandUsage, size_t>> operationOperandIndex;
+		static _STD_UNORDERED_MAP<BNHighLevelILOperation, _STD_VECTOR<HighLevelILOperandUsage>> operationOperandUsage;
+		static _STD_UNORDERED_MAP<BNHighLevelILOperation, _STD_UNORDERED_MAP<HighLevelILOperandUsage, size_t>>
+		    operationOperandIndex;
 
 		HighLevelILOperandList GetOperands() const;
 
@@ -314,8 +323,8 @@ namespace BinaryNinja
 		void UpdateRawOperandAsExprList(size_t operandIndex, const _STD_VECTOR<size_t>& exprs);
 
 		RegisterValue GetValue() const;
-		PossibleValueSet GetPossibleValues(const _STD_SET<BNDataFlowQueryOption>& options =
-			_STD_SET<BNDataFlowQueryOption>()) const;
+		PossibleValueSet GetPossibleValues(
+		    const _STD_SET<BNDataFlowQueryOption>& options = _STD_SET<BNDataFlowQueryOption>()) const;
 		Confidence<Ref<Type>> GetType() const;
 
 		size_t GetSSAExprIndex() const;
@@ -347,14 +356,8 @@ namespace BinaryNinja
 				throw HighLevelILInstructionAccessException();
 			return *(HighLevelILInstructionAccessor<N>*)this;
 		}
-		HighLevelILOneOperandInstruction& AsOneOperand()
-		{
-			return *(HighLevelILOneOperandInstruction*)this;
-		}
-		HighLevelILTwoOperandInstruction& AsTwoOperand()
-		{
-			return *(HighLevelILTwoOperandInstruction*)this;
-		}
+		HighLevelILOneOperandInstruction& AsOneOperand() { return *(HighLevelILOneOperandInstruction*)this; }
+		HighLevelILTwoOperandInstruction& AsTwoOperand() { return *(HighLevelILTwoOperandInstruction*)this; }
 		HighLevelILTwoOperandWithCarryInstruction& AsTwoOperandWithCarry()
 		{
 			return *(HighLevelILTwoOperandWithCarryInstruction*)this;
@@ -385,77 +388,285 @@ namespace BinaryNinja
 		}
 	};
 
-	struct HighLevelILInstruction: public HighLevelILInstructionBase
+	struct HighLevelILInstruction : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction();
-		HighLevelILInstruction(HighLevelILFunction* func, const BNHighLevelILInstruction& instr,
-			size_t expr, bool asFullAst, size_t instructionIndex);
+		HighLevelILInstruction(HighLevelILFunction* func, const BNHighLevelILInstruction& instr, size_t expr,
+		    bool asFullAst, size_t instructionIndex);
 		HighLevelILInstruction(const HighLevelILInstructionBase& instr);
 
 		void VisitExprs(const std::function<bool(const HighLevelILInstruction& expr)>& func) const;
 
 		ExprId CopyTo(HighLevelILFunction* dest) const;
 		ExprId CopyTo(HighLevelILFunction* dest,
-			const std::function<ExprId(const HighLevelILInstruction& subExpr)>& subExprHandler) const;
+		    const std::function<ExprId(const HighLevelILInstruction& subExpr)>& subExprHandler) const;
 
 		bool operator<(const HighLevelILInstruction& other) const;
 		bool operator==(const HighLevelILInstruction& other) const;
 		bool operator!=(const HighLevelILInstruction& other) const;
 
 		// Templated accessors for instruction operands, use these for efficient access to a known instruction
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetSourceExpr() const { return As<N>().GetSourceExpr(); }
-		template <BNHighLevelILOperation N> Variable GetVariable() const { return As<N>().GetVariable(); }
-		template <BNHighLevelILOperation N> Variable GetDestVariable() const { return As<N>().GetDestVariable(); }
-		template <BNHighLevelILOperation N> SSAVariable GetSSAVariable() const { return As<N>().GetSSAVariable(); }
-		template <BNHighLevelILOperation N> SSAVariable GetDestSSAVariable() const { return As<N>().GetDestSSAVariable(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetDestExpr() const { return As<N>().GetDestExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetLeftExpr() const { return As<N>().GetLeftExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetRightExpr() const { return As<N>().GetRightExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetCarryExpr() const { return As<N>().GetCarryExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetIndexExpr() const { return As<N>().GetIndexExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetConditionPhiExpr() const { return As<N>().GetConditionPhiExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetConditionExpr() const { return As<N>().GetConditionExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetTrueExpr() const { return As<N>().GetTrueExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetFalseExpr() const { return As<N>().GetFalseExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetLoopExpr() const { return As<N>().GetLoopExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetInitExpr() const { return As<N>().GetInitExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetUpdateExpr() const { return As<N>().GetUpdateExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetDefaultExpr() const { return As<N>().GetDefaultExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetHighExpr() const { return As<N>().GetHighExpr(); }
-		template <BNHighLevelILOperation N> HighLevelILInstruction GetLowExpr() const { return As<N>().GetLowExpr(); }
-		template <BNHighLevelILOperation N> uint64_t GetOffset() const { return As<N>().GetOffset(); }
-		template <BNHighLevelILOperation N> size_t GetMemberIndex() const { return As<N>().GetMemberIndex(); }
-		template <BNHighLevelILOperation N> int64_t GetConstant() const { return As<N>().GetConstant(); }
-		template <BNHighLevelILOperation N> int64_t GetVector() const { return As<N>().GetVector(); }
-		template <BNHighLevelILOperation N> uint32_t GetIntrinsic() const { return As<N>().GetIntrinsic(); }
-		template <BNHighLevelILOperation N> uint64_t GetTarget() const { return As<N>().GetTarget(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetParameterExprs() const { return As<N>().GetParameterExprs(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetSourceExprs() const { return As<N>().GetSourceExprs(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetDestExprs() const { return As<N>().GetDestExprs(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetBlockExprs() const { return As<N>().GetBlockExprs(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetCases() const { return As<N>().GetCases(); }
-		template <BNHighLevelILOperation N> HighLevelILInstructionList GetValueExprs() const { return As<N>().GetValueExprs(); }
-		template <BNHighLevelILOperation N> HighLevelILSSAVariableList GetSourceSSAVariables() const { return As<N>().GetSourceSSAVariables(); }
-		template <BNHighLevelILOperation N> size_t GetSourceMemoryVersion() const { return As<N>().GetSourceMemoryVersion(); }
-		template <BNHighLevelILOperation N> HighLevelILIndexList GetSourceMemoryVersions() const { return As<N>().GetSourceMemoryVersions(); }
-		template <BNHighLevelILOperation N> size_t GetDestMemoryVersion() const { return As<N>().GetDestMemoryVersion(); }
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetSourceExpr() const
+		{
+			return As<N>().GetSourceExpr();
+		}
+		template <BNHighLevelILOperation N>
+		Variable GetVariable() const
+		{
+			return As<N>().GetVariable();
+		}
+		template <BNHighLevelILOperation N>
+		Variable GetDestVariable() const
+		{
+			return As<N>().GetDestVariable();
+		}
+		template <BNHighLevelILOperation N>
+		SSAVariable GetSSAVariable() const
+		{
+			return As<N>().GetSSAVariable();
+		}
+		template <BNHighLevelILOperation N>
+		SSAVariable GetDestSSAVariable() const
+		{
+			return As<N>().GetDestSSAVariable();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetDestExpr() const
+		{
+			return As<N>().GetDestExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetLeftExpr() const
+		{
+			return As<N>().GetLeftExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetRightExpr() const
+		{
+			return As<N>().GetRightExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetCarryExpr() const
+		{
+			return As<N>().GetCarryExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetIndexExpr() const
+		{
+			return As<N>().GetIndexExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetConditionPhiExpr() const
+		{
+			return As<N>().GetConditionPhiExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetConditionExpr() const
+		{
+			return As<N>().GetConditionExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetTrueExpr() const
+		{
+			return As<N>().GetTrueExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetFalseExpr() const
+		{
+			return As<N>().GetFalseExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetLoopExpr() const
+		{
+			return As<N>().GetLoopExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetInitExpr() const
+		{
+			return As<N>().GetInitExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetUpdateExpr() const
+		{
+			return As<N>().GetUpdateExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetDefaultExpr() const
+		{
+			return As<N>().GetDefaultExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetHighExpr() const
+		{
+			return As<N>().GetHighExpr();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstruction GetLowExpr() const
+		{
+			return As<N>().GetLowExpr();
+		}
+		template <BNHighLevelILOperation N>
+		uint64_t GetOffset() const
+		{
+			return As<N>().GetOffset();
+		}
+		template <BNHighLevelILOperation N>
+		size_t GetMemberIndex() const
+		{
+			return As<N>().GetMemberIndex();
+		}
+		template <BNHighLevelILOperation N>
+		int64_t GetConstant() const
+		{
+			return As<N>().GetConstant();
+		}
+		template <BNHighLevelILOperation N>
+		int64_t GetVector() const
+		{
+			return As<N>().GetVector();
+		}
+		template <BNHighLevelILOperation N>
+		uint32_t GetIntrinsic() const
+		{
+			return As<N>().GetIntrinsic();
+		}
+		template <BNHighLevelILOperation N>
+		uint64_t GetTarget() const
+		{
+			return As<N>().GetTarget();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetParameterExprs() const
+		{
+			return As<N>().GetParameterExprs();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetSourceExprs() const
+		{
+			return As<N>().GetSourceExprs();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetDestExprs() const
+		{
+			return As<N>().GetDestExprs();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetBlockExprs() const
+		{
+			return As<N>().GetBlockExprs();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetCases() const
+		{
+			return As<N>().GetCases();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILInstructionList GetValueExprs() const
+		{
+			return As<N>().GetValueExprs();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILSSAVariableList GetSourceSSAVariables() const
+		{
+			return As<N>().GetSourceSSAVariables();
+		}
+		template <BNHighLevelILOperation N>
+		size_t GetSourceMemoryVersion() const
+		{
+			return As<N>().GetSourceMemoryVersion();
+		}
+		template <BNHighLevelILOperation N>
+		HighLevelILIndexList GetSourceMemoryVersions() const
+		{
+			return As<N>().GetSourceMemoryVersions();
+		}
+		template <BNHighLevelILOperation N>
+		size_t GetDestMemoryVersion() const
+		{
+			return As<N>().GetDestMemoryVersion();
+		}
 
-		template <BNHighLevelILOperation N> void SetSSAVersion(size_t version) { As<N>().SetSSAVersion(version); }
-		template <BNHighLevelILOperation N> void SetDestSSAVersion(size_t version) { As<N>().SetDestSSAVersion(version); }
-		template <BNHighLevelILOperation N> void SetParameterExprs(const _STD_VECTOR<MediumLevelILInstruction>& params) { As<N>().SetParameterExprs(params); }
-		template <BNHighLevelILOperation N> void SetParameterExprs(const _STD_VECTOR<ExprId>& params) { As<N>().SetParameterExprs(params); }
-		template <BNHighLevelILOperation N> void SetSourceExprs(const _STD_VECTOR<MediumLevelILInstruction>& params) { As<N>().SetSourceExprs(params); }
-		template <BNHighLevelILOperation N> void SetSourceExprs(const _STD_VECTOR<ExprId>& params) { As<N>().SetSourceExprs(params); }
-		template <BNHighLevelILOperation N> void SetDestExprs(const _STD_VECTOR<MediumLevelILInstruction>& params) { As<N>().SetDestExprs(params); }
-		template <BNHighLevelILOperation N> void SetDestExprs(const _STD_VECTOR<ExprId>& params) { As<N>().SetDestExprs(params); }
-		template <BNHighLevelILOperation N> void SetBlockExprs(const _STD_VECTOR<MediumLevelILInstruction>& params) { As<N>().SetBlockExprs(params); }
-		template <BNHighLevelILOperation N> void SetBlockExprs(const _STD_VECTOR<ExprId>& params) { As<N>().SetBlockExprs(params); }
-		template <BNHighLevelILOperation N> void SetCases(const _STD_VECTOR<MediumLevelILInstruction>& params) { As<N>().SetCases(params); }
-		template <BNHighLevelILOperation N> void SetCases(const _STD_VECTOR<ExprId>& params) { As<N>().SetCases(params); }
-		template <BNHighLevelILOperation N> void SetSourceSSAVariables(const _STD_VECTOR<SSAVariable>& vars) { As<N>().SetSourceSSAVariables(vars); }
-		template <BNHighLevelILOperation N> void SetSourceMemoryVersion(size_t version) { return As<N>().SetSourceMemoryVersion(version); }
-		template <BNHighLevelILOperation N> void SetDestMemoryVersion(size_t version) { return As<N>().SetDestMemoryVersion(version); }
-		template <BNHighLevelILOperation N> void SetTarget(uint64_t target) { As<N>().SetTarget(target); }
+		template <BNHighLevelILOperation N>
+		void SetSSAVersion(size_t version)
+		{
+			As<N>().SetSSAVersion(version);
+		}
+		template <BNHighLevelILOperation N>
+		void SetDestSSAVersion(size_t version)
+		{
+			As<N>().SetDestSSAVersion(version);
+		}
+		template <BNHighLevelILOperation N>
+		void SetParameterExprs(const _STD_VECTOR<MediumLevelILInstruction>& params)
+		{
+			As<N>().SetParameterExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetParameterExprs(const _STD_VECTOR<ExprId>& params)
+		{
+			As<N>().SetParameterExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetSourceExprs(const _STD_VECTOR<MediumLevelILInstruction>& params)
+		{
+			As<N>().SetSourceExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetSourceExprs(const _STD_VECTOR<ExprId>& params)
+		{
+			As<N>().SetSourceExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetDestExprs(const _STD_VECTOR<MediumLevelILInstruction>& params)
+		{
+			As<N>().SetDestExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetDestExprs(const _STD_VECTOR<ExprId>& params)
+		{
+			As<N>().SetDestExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetBlockExprs(const _STD_VECTOR<MediumLevelILInstruction>& params)
+		{
+			As<N>().SetBlockExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetBlockExprs(const _STD_VECTOR<ExprId>& params)
+		{
+			As<N>().SetBlockExprs(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetCases(const _STD_VECTOR<MediumLevelILInstruction>& params)
+		{
+			As<N>().SetCases(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetCases(const _STD_VECTOR<ExprId>& params)
+		{
+			As<N>().SetCases(params);
+		}
+		template <BNHighLevelILOperation N>
+		void SetSourceSSAVariables(const _STD_VECTOR<SSAVariable>& vars)
+		{
+			As<N>().SetSourceSSAVariables(vars);
+		}
+		template <BNHighLevelILOperation N>
+		void SetSourceMemoryVersion(size_t version)
+		{
+			return As<N>().SetSourceMemoryVersion(version);
+		}
+		template <BNHighLevelILOperation N>
+		void SetDestMemoryVersion(size_t version)
+		{
+			return As<N>().SetDestMemoryVersion(version);
+		}
+		template <BNHighLevelILOperation N>
+		void SetTarget(uint64_t target)
+		{
+			As<N>().SetTarget(target);
+		}
 
 		bool GetOperandIndexForUsage(HighLevelILOperandUsage usage, size_t& operandIndex) const;
 
@@ -506,9 +717,8 @@ namespace BinaryNinja
 		HighLevelILOperandType m_type;
 		size_t m_operandIndex;
 
-	public:
-		HighLevelILOperand(const HighLevelILInstruction& instr, HighLevelILOperandUsage usage,
-			size_t operandIndex);
+	  public:
+		HighLevelILOperand(const HighLevelILInstruction& instr, HighLevelILOperandUsage usage, size_t operandIndex);
 
 		HighLevelILOperandType GetType() const { return m_type; }
 		HighLevelILOperandUsage GetUsage() const { return m_usage; }
@@ -533,7 +743,11 @@ namespace BinaryNinja
 			bool operator==(const ListIterator& a) const { return pos == a.pos; }
 			bool operator!=(const ListIterator& a) const { return pos != a.pos; }
 			bool operator<(const ListIterator& a) const { return pos < a.pos; }
-			ListIterator& operator++() { ++pos; return *this; }
+			ListIterator& operator++()
+			{
+				++pos;
+				return *this;
+			}
 			const HighLevelILOperand operator*();
 		};
 
@@ -541,12 +755,12 @@ namespace BinaryNinja
 		const _STD_VECTOR<HighLevelILOperandUsage>& m_usageList;
 		const _STD_UNORDERED_MAP<HighLevelILOperandUsage, size_t>& m_operandIndexMap;
 
-	public:
+	  public:
 		typedef ListIterator const_iterator;
 
 		HighLevelILOperandList(const HighLevelILInstruction& instr,
-			const _STD_VECTOR<HighLevelILOperandUsage>& usageList,
-			const _STD_UNORDERED_MAP<HighLevelILOperandUsage, size_t>& operandIndexMap);
+		    const _STD_VECTOR<HighLevelILOperandUsage>& usageList,
+		    const _STD_UNORDERED_MAP<HighLevelILOperandUsage, size_t>& operandIndexMap);
 
 		const_iterator begin() const;
 		const_iterator end() const;
@@ -556,23 +770,23 @@ namespace BinaryNinja
 		operator _STD_VECTOR<HighLevelILOperand>() const;
 	};
 
-	struct HighLevelILConstantInstruction: public HighLevelILInstructionBase
+	struct HighLevelILConstantInstruction : public HighLevelILInstructionBase
 	{
 		int64_t GetConstant() const { return GetRawOperandAsInteger(0); }
 	};
 
-	struct HighLevelILOneOperandInstruction: public HighLevelILInstructionBase
+	struct HighLevelILOneOperandInstruction : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 	};
 
-	struct HighLevelILTwoOperandInstruction: public HighLevelILInstructionBase
+	struct HighLevelILTwoOperandInstruction : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetLeftExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetRightExpr() const { return GetRawOperandAsExpr(1); }
 	};
 
-	struct HighLevelILTwoOperandWithCarryInstruction: public HighLevelILInstructionBase
+	struct HighLevelILTwoOperandWithCarryInstruction : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetLeftExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetRightExpr() const { return GetRawOperandAsExpr(1); }
@@ -582,46 +796,54 @@ namespace BinaryNinja
 	// Implementations of each instruction to fetch the correct operand value for the valid operands, these
 	// are derived from HighLevelILInstructionBase so that invalid operand accessor functions will generate
 	// a compiler error.
-	template <> struct HighLevelILInstructionAccessor<HLIL_BLOCK>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_BLOCK> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetBlockExprs() const { return GetRawOperandAsExprList(0); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_IF>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_IF> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetTrueExpr() const { return GetRawOperandAsExpr(1); }
 		HighLevelILInstruction GetFalseExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_WHILE>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_WHILE> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_WHILE_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_WHILE_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetConditionPhiExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(1); }
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DO_WHILE>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DO_WHILE> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DO_WHILE_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DO_WHILE_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetConditionPhiExpr() const { return GetRawOperandAsExpr(1); }
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FOR>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FOR> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetInitExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(1); }
 		HighLevelILInstruction GetUpdateExpr() const { return GetRawOperandAsExpr(2); }
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(3); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FOR_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FOR_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetInitExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetConditionPhiExpr() const { return GetRawOperandAsExpr(1); }
@@ -629,60 +851,71 @@ namespace BinaryNinja
 		HighLevelILInstruction GetUpdateExpr() const { return GetRawOperandAsExpr(3); }
 		HighLevelILInstruction GetLoopExpr() const { return GetRawOperandAsExpr(4); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SWITCH>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SWITCH> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetConditionExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetDefaultExpr() const { return GetRawOperandAsExpr(1); }
 		HighLevelILInstructionList GetCases() const { return GetRawOperandAsExprList(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CASE>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CASE> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetValueExprs() const { return GetRawOperandAsExprList(0); }
 		HighLevelILInstruction GetTrueExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_GOTO>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_GOTO> : public HighLevelILInstructionBase
 	{
 		uint64_t GetTarget() const { return GetRawOperandAsInteger(0); }
 		void SetTarget(uint64_t target) { UpdateRawOperandAsInteger(0, target); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_LABEL>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_LABEL> : public HighLevelILInstructionBase
 	{
 		uint64_t GetTarget() const { return GetRawOperandAsInteger(0); }
 		void SetTarget(uint64_t target) { UpdateRawOperandAsInteger(0, target); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_RET>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_RET> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetSourceExprs() const { return GetRawOperandAsExprList(0); }
 		void SetSourceExprs(const _STD_VECTOR<ExprId>& exprs) { UpdateRawOperandAsExprList(0, exprs); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR_DECLARE>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR_DECLARE> : public HighLevelILInstructionBase
 	{
 		Variable GetVariable() const { return GetRawOperandAsVariable(0); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR_INIT>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR_INIT> : public HighLevelILInstructionBase
 	{
 		Variable GetDestVariable() const { return GetRawOperandAsVariable(0); }
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR_INIT_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR_INIT_SSA> : public HighLevelILInstructionBase
 	{
 		SSAVariable GetDestSSAVariable() const { return GetRawOperandAsSSAVariable(0); }
 		void SetDestSSAVersion(size_t version) { UpdateRawOperand(1, version); }
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ASSIGN>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ASSIGN> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ASSIGN_UNPACK>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ASSIGN_UNPACK> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetDestExprs() const { return GetRawOperandAsExprList(0); }
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ASSIGN_MEM_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ASSIGN_MEM_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 		size_t GetDestMemoryVersion() const { return GetRawOperandAsIndex(1); }
@@ -691,7 +924,8 @@ namespace BinaryNinja
 		size_t GetSourceMemoryVersion() const { return GetRawOperandAsIndex(3); }
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(3, version); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ASSIGN_UNPACK_MEM_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ASSIGN_UNPACK_MEM_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetDestExprs() const { return GetRawOperandAsExprList(0); }
 		size_t GetDestMemoryVersion() const { return GetRawOperandAsIndex(2); }
@@ -701,25 +935,29 @@ namespace BinaryNinja
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(4, version); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_STRUCT_FIELD>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_STRUCT_FIELD> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		uint64_t GetOffset() const { return GetRawOperandAsInteger(1); }
 		size_t GetMemberIndex() const { return GetRawOperandAsIndex(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DEREF_FIELD>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DEREF_FIELD> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		uint64_t GetOffset() const { return GetRawOperandAsInteger(1); }
 		size_t GetMemberIndex() const { return GetRawOperandAsIndex(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DEREF_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DEREF_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		size_t GetSourceMemoryVersion() const { return GetRawOperandAsIndex(1); }
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(1, version); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DEREF_FIELD_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DEREF_FIELD_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		size_t GetSourceMemoryVersion() const { return GetRawOperandAsIndex(1); }
@@ -727,66 +965,78 @@ namespace BinaryNinja
 		uint64_t GetOffset() const { return GetRawOperandAsInteger(2); }
 		size_t GetMemberIndex() const { return GetRawOperandAsIndex(3); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ARRAY_INDEX>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ARRAY_INDEX> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetIndexExpr() const { return GetRawOperandAsExpr(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ARRAY_INDEX_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ARRAY_INDEX_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetSourceExpr() const { return GetRawOperandAsExpr(0); }
 		size_t GetSourceMemoryVersion() const { return GetRawOperandAsIndex(1); }
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(1, version); }
 		HighLevelILInstruction GetIndexExpr() const { return GetRawOperandAsExpr(2); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SPLIT>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SPLIT> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetHighExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstruction GetLowExpr() const { return GetRawOperandAsExpr(1); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR> : public HighLevelILInstructionBase
 	{
 		Variable GetVariable() const { return GetRawOperandAsVariable(0); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR_SSA> : public HighLevelILInstructionBase
 	{
 		SSAVariable GetSSAVariable() const { return GetRawOperandAsSSAVariable(0); }
 		void SetSSAVersion(size_t version) { UpdateRawOperand(1, version); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_VAR_PHI>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_VAR_PHI> : public HighLevelILInstructionBase
 	{
 		SSAVariable GetDestSSAVariable() const { return GetRawOperandAsSSAVariable(0); }
 		HighLevelILSSAVariableList GetSourceSSAVariables() const { return GetRawOperandAsSSAVariableList(2); }
 		void SetSourceSSAVariables(const _STD_VECTOR<SSAVariable>& vars) { UpdateRawOperandAsSSAVariableList(2, vars); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MEM_PHI>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MEM_PHI> : public HighLevelILInstructionBase
 	{
 		size_t GetDestMemoryVersion() const { return GetRawOperandAsIndex(0); }
 		void SetDestMemoryVersion(size_t version) { UpdateRawOperand(0, version); }
 		HighLevelILIndexList GetSourceMemoryVersions() const { return GetRawOperandAsIndexList(1); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_JUMP>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_JUMP> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_CALL>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CALL> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SYSCALL>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SYSCALL> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(0); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_TAILCALL>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_TAILCALL> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CALL_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CALL_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstruction GetDestExpr() const { return GetRawOperandAsExpr(0); }
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(1); }
@@ -795,7 +1045,8 @@ namespace BinaryNinja
 		size_t GetSourceMemoryVersion() const { return GetRawOperandAsIndex(4); }
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(4, version); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SYSCALL_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SYSCALL_SSA> : public HighLevelILInstructionBase
 	{
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(0); }
 		size_t GetDestMemoryVersion() const { return GetRawOperandAsIndex(2); }
@@ -804,12 +1055,14 @@ namespace BinaryNinja
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(3, version); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_INTRINSIC>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_INTRINSIC> : public HighLevelILInstructionBase
 	{
 		uint32_t GetIntrinsic() const { return (uint32_t)GetRawOperandAsInteger(0); }
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(1); }
 	};
-	template <> struct HighLevelILInstructionAccessor<HLIL_INTRINSIC_SSA>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_INTRINSIC_SSA> : public HighLevelILInstructionBase
 	{
 		uint32_t GetIntrinsic() const { return (uint32_t)GetRawOperandAsInteger(0); }
 		HighLevelILInstructionList GetParameterExprs() const { return GetRawOperandAsExprList(1); }
@@ -819,102 +1072,262 @@ namespace BinaryNinja
 		void SetSourceMemoryVersion(size_t version) { UpdateRawOperand(4, version); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_TRAP>: public HighLevelILInstructionBase
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_TRAP> : public HighLevelILInstructionBase
 	{
 		int64_t GetVector() const { return GetRawOperandAsInteger(0); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_EXTERN_PTR>: public HighLevelILConstantInstruction
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_EXTERN_PTR> : public HighLevelILConstantInstruction
 	{
 		int64_t GetConstant() const { return GetRawOperandAsInteger(0); }
 		int64_t GetOffset() const { return GetRawOperandAsInteger(1); }
 	};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_NOP>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_BREAK>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CONTINUE>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_NORET>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_BP>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_UNDEF>: public HighLevelILInstructionBase {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_UNIMPL>: public HighLevelILInstructionBase {};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_NOP> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_BREAK> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CONTINUE> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_NORET> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_BP> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_UNDEF> : public HighLevelILInstructionBase
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_UNIMPL> : public HighLevelILInstructionBase
+	{};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_CONST>: public HighLevelILConstantInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CONST_PTR>: public HighLevelILConstantInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FLOAT_CONST>: public HighLevelILConstantInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_IMPORT>: public HighLevelILConstantInstruction {};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CONST> : public HighLevelILConstantInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CONST_PTR> : public HighLevelILConstantInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FLOAT_CONST> : public HighLevelILConstantInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_IMPORT> : public HighLevelILConstantInstruction
+	{};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_ADD>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SUB>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_AND>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_OR>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_XOR>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_LSL>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_LSR>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ASR>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ROL>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ROR>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MUL>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MULU_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MULS_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DIVU>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DIVS>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MODU>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MODS>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DIVU_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_DIVS_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MODU_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_MODS_DP>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_E>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_NE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_SLT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_ULT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_SLE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_ULE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_SGE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_UGE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_SGT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CMP_UGT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_TEST_BIT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ADD_OVERFLOW>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FADD>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FSUB>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FMUL>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FDIV>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_E>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_NE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_LT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_LE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_GE>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_GT>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_O>: public HighLevelILTwoOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FCMP_UO>: public HighLevelILTwoOperandInstruction {};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ADD> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SUB> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_AND> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_OR> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_XOR> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_LSL> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_LSR> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ASR> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ROL> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ROR> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MUL> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MULU_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MULS_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DIVU> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DIVS> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MODU> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MODS> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DIVU_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DIVS_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MODU_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_MODS_DP> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_E> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_NE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_SLT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_ULT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_SLE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_ULE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_SGE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_UGE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_SGT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CMP_UGT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_TEST_BIT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ADD_OVERFLOW> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FADD> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FSUB> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FMUL> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FDIV> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_E> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_NE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_LT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_LE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_GE> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_GT> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_O> : public HighLevelILTwoOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FCMP_UO> : public HighLevelILTwoOperandInstruction
+	{};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_ADC>: public HighLevelILTwoOperandWithCarryInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SBB>: public HighLevelILTwoOperandWithCarryInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_RLC>: public HighLevelILTwoOperandWithCarryInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_RRC>: public HighLevelILTwoOperandWithCarryInstruction {};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ADC> : public HighLevelILTwoOperandWithCarryInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SBB> : public HighLevelILTwoOperandWithCarryInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_RLC> : public HighLevelILTwoOperandWithCarryInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_RRC> : public HighLevelILTwoOperandWithCarryInstruction
+	{};
 
-	template <> struct HighLevelILInstructionAccessor<HLIL_DEREF>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ADDRESS_OF>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_NEG>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_NOT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_SX>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ZX>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_LOW_PART>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_BOOL_TO_INT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_UNIMPL_MEM>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FSQRT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FNEG>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FABS>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FLOAT_TO_INT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_INT_TO_FLOAT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FLOAT_CONV>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_ROUND_TO_INT>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FLOOR>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_CEIL>: public HighLevelILOneOperandInstruction {};
-	template <> struct HighLevelILInstructionAccessor<HLIL_FTRUNC>: public HighLevelILOneOperandInstruction {};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_DEREF> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ADDRESS_OF> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_NEG> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_NOT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_SX> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ZX> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_LOW_PART> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_BOOL_TO_INT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_UNIMPL_MEM> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FSQRT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FNEG> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FABS> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FLOAT_TO_INT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_INT_TO_FLOAT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FLOAT_CONV> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_ROUND_TO_INT> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FLOOR> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_CEIL> : public HighLevelILOneOperandInstruction
+	{};
+	template <>
+	struct HighLevelILInstructionAccessor<HLIL_FTRUNC> : public HighLevelILOneOperandInstruction
+	{};
 
 #undef _STD_VECTOR
 #undef _STD_SET
 #undef _STD_UNORDERED_MAP
-}
+}  // namespace BinaryNinjaCore