summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Wagner <rusty.wagner@gmail.com>2024-10-11 21:39:52 -0400
committerRusty Wagner <rusty.wagner@gmail.com>2024-10-21 13:56:57 -0400
commitfaaf191349e170403273c0496df24c65a3536f34 (patch)
tree66e2f7a6d2ef67d321f29cedd96a7692b35d73b0
parentd8e3001e535fad178c621ff07418f81f25123dc4 (diff)
Allow `current_il_instruction` to work in Pseudo C (or any high level language)
-rw-r--r--highlevelil.cpp2
-rw-r--r--python/scriptingprovider.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/highlevelil.cpp b/highlevelil.cpp
index 698b6119..89cf645f 100644
--- a/highlevelil.cpp
+++ b/highlevelil.cpp
@@ -717,7 +717,7 @@ void HighLevelILTokenEmitter::EndForceZeroConfidence()
HighLevelILTokenEmitter::CurrentExprGuard HighLevelILTokenEmitter::SetCurrentExpr(const HighLevelILInstruction& expr)
{
- return CurrentExprGuard(*this, {expr.address, expr.sourceOperand, expr.exprIndex, expr.instructionIndex});
+ return CurrentExprGuard(*this, {expr.address, expr.sourceOperand, expr.exprIndex, expr.GetInstructionIndex()});
}
diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 4b76939f..3c673542 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -1823,7 +1823,7 @@ def _get_current_il_function(instance: PythonScriptingInstance):
return instance.interpreter.locals["current_mlil"]
elif ilType.view_type == FunctionGraphType.MediumLevelILSSAFormFunctionGraph:
return instance.interpreter.locals["current_mlil_ssa"]
- elif ilType.view_type == FunctionGraphType.HighLevelILFunctionGraph:
+ elif ilType.view_type == FunctionGraphType.HighLevelILFunctionGraph or ilType.view_type == FunctionGraphType.HighLevelLanguageRepresentationFunctionGraph:
return instance.interpreter.locals["current_hlil"]
elif ilType.view_type == FunctionGraphType.HighLevelILSSAFormFunctionGraph:
return instance.interpreter.locals["current_hlil_ssa"]