Python: get_instruction_index_for_expr for all ILs

Author: CouleeApps

python/highlevelil.py

@@ -4713,6 +4713,16 @@ def ssa_vars(self) -> List["mediumlevelil.SSAVariable"]:
 
 		return []
 
+	def get_instruction_index_for_expr(self, expr: ExpressionIndex) -> Optional[InstructionIndex]:
+		result = core.BNGetHighLevelILInstructionForExpr(self.handle, expr)
+		if result >= core.BNGetHighLevelILInstructionCount(self.handle):
+			return None
+		return InstructionIndex(result)
+
+	def get_expr_index_for_instruction(self, instr: InstructionIndex) -> ExpressionIndex:
+		result = core.BNGetHighLevelILIndexForInstruction(self.handle, instr)
+		return ExpressionIndex(result)
+
 	def get_medium_level_il_expr_index(self, expr: ExpressionIndex) -> Optional['mediumlevelil.ExpressionIndex']:
 		medium_il = self.medium_level_il
 		if medium_il is None:

python/lowlevelil.py

@@ -6230,7 +6230,7 @@ def get_instruction_index_for_expr(self, expr: ExpressionIndex) -> Optional[Inst
 		return InstructionIndex(result)
 
 	def get_expr_index_for_instruction(self, instr: InstructionIndex) -> ExpressionIndex:
-		result = core.BNGetLowLevelILInstructionForExpr(self.handle, instr)
+		result = core.BNGetLowLevelILIndexForInstruction(self.handle, instr)
 		return ExpressionIndex(result)
 
 	def get_medium_level_il_instruction_index(self,

python/mediumlevelil.py

@@ -5516,6 +5516,16 @@ def get_ssa_var_value(self, ssa_var: SSAVariable) -> 'variable.RegisterValue':
 		result = variable.RegisterValue.from_BNRegisterValue(value, self._arch)
 		return result
 
+	def get_instruction_index_for_expr(self, expr: ExpressionIndex) -> Optional[InstructionIndex]:
+		result = core.BNGetMediumLevelILInstructionForExpr(self.handle, expr)
+		if result >= core.BNGetMediumLevelILInstructionCount(self.handle):
+			return None
+		return InstructionIndex(result)
+
+	def get_expr_index_for_instruction(self, instr: InstructionIndex) -> ExpressionIndex:
+		result = core.BNGetMediumLevelILIndexForInstruction(self.handle, instr)
+		return ExpressionIndex(result)
+
 	def get_low_level_il_instruction_index(self, instr: InstructionIndex) -> Optional['lowlevelil.InstructionIndex']:
 		low_il = self.low_level_il
 		if low_il is None: