Add High Level IL Mappings.

3 files changed, 80 insertions, 0 deletions

diff --git a/python/highlevelil.py b/python/highlevelil.py
index 589d6505..56619f05 100644
--- a/python/highlevelil.py
+++ b/python/highlevelil.py
@@ -530,6 +530,16 @@ class HighLevelILInstruction(object):
 		return self.medium_level_il
 
 	@property
+	def low_level_il(self):
+		"""Low level IL form of this expression"""
+		return self.mlil.llil
+
+	@property
+	def llil(self):
+		"""Alias for low_level_il"""
+		return self.low_level_il
+
+	@property
 	def il_basic_block(self):
 		"""IL basic block object containing this expression (read-only) (only available on finalized functions)"""
 		return HighLevelILBasicBlock(self._function.source_function.view, core.BNGetHighLevelILBasicBlockForInstruction(self._function.handle, self._instr_index), self._function)
diff --git a/python/lowlevelil.py b/python/lowlevelil.py
index 9435f07b..64a862d6 100644
--- a/python/lowlevelil.py
+++ b/python/lowlevelil.py
@@ -1026,6 +1026,15 @@ class LowLevelILInstruction(object):
 		return self.mapped_medium_level_il
 
 	@property
+	def high_level_il(self):
+		"""Gets the high level IL expression corresponding to this expression (may be None for eliminated instructions)"""
+		return self.mlil.hlil
+
+	@property
+	def hlil(self):
+		return self.high_level_il
+
+	@property
 	def value(self):
 		"""Value of expression if constant or a known value (read-only)"""
 		value = core.BNGetLowLevelILExprValue(self._function.handle, self.expr_index)
@@ -2999,6 +3008,24 @@ class LowLevelILFunction(object):
 			return None
 		return result
 
+	def get_high_level_il_instruction_index(self, instr):
+		med_il = self.medium_level_il
+		if med_il is None:
+			return None
+		mlil_instr = self.get_medium_level_il_instruction_index(instr)
+		if mlil_instr is None:
+			return None
+		return med_il.get_high_level_il_instruction_index(mlil_instr)
+
+	def get_high_level_il_expr_index(self, expr):
+		med_il = self.medium_level_il
+		if med_il is None:
+			return None
+		mlil_expr = self.get_medium_level_il_expr_index(expr)
+		if mlil_expr is None:
+			return None
+		return med_il.get_high_level_il_expr_index(mlil_expr)
+
 	def create_graph(self, settings = None):
 		if settings is not None:
 			settings_obj = settings.handle
diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py
index 857d8cff..68da31f3 100644
--- a/python/mediumlevelil.py
+++ b/python/mediumlevelil.py
@@ -470,6 +470,19 @@ class MediumLevelILInstruction(object):
 		return self.low_level_il
 
 	@property
+	def high_level_il(self):
+		"""High level IL form of this expression"""
+		expr = self._function.get_high_level_il_expr_index(self._expr_index)
+		if expr is None:
+			return None
+		return binaryninja.highlevelil.HighLevelILInstruction(self._function.high_level_il, expr)
+
+	@property
+	def hlil(self):
+		"""Alias for high_level_il"""
+		return self.high_level_il
+
+	@property
 	def ssa_memory_version(self):
 		"""Version of active memory contents in SSA form for this instruction"""
 		return core.BNGetMediumLevelILSSAMemoryVersionAtILInstruction(self._function.handle, self._instr_index)
@@ -927,6 +940,18 @@ class MediumLevelILFunction(object):
 		"""Alias for low_level_il"""
 		return self.low_level_il
 
+	@property
+	def high_level_il(self):
+		"""High level IL for this medium level IL."""
+		result = core.BNGetHighLevelILForMediumLevelIL(self.handle)
+		if not result:
+			return None
+		return binaryninja.highlevelil.HighLevelILFunction(self._arch, result, self._source_function)
+
+	@property
+	def hlil(self):
+		return self.high_level_il
+
 	def get_instruction_start(self, addr, arch = None):
 		if arch is None:
 			arch = self._arch
@@ -1137,6 +1162,24 @@ class MediumLevelILFunction(object):
 			return None
 		return result
 
+	def get_high_level_il_instruction_index(self, instr):
+		high_il = self.high_level_il
+		if high_il is None:
+			return None
+		result = core.BNGetHighLevelILInstructionIndex(self.handle, instr)
+		if result >= core.BNGetHighLevelILInstructionCount(high_il.handle):
+			return None
+		return result
+
+	def get_high_level_il_expr_index(self, expr):
+		high_il = self.high_level_il
+		if high_il is None:
+			return None
+		result = core.BNGetHighLevelILExprIndex(self.handle, expr)
+		if result >= core.BNGetHighLevelILExprCount(high_il.handle):
+			return None
+		return result
+
 	def create_graph(self, settings = None):
 		if settings is not None:
 			settings_obj = settings.handle