From 7b816fc2e285aa9cd77fba33bc55afa16947095f Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Thu, 1 Jun 2023 17:36:20 -0400 Subject: Add Var, SSAVar, and AliasedVar to commonil.py, and update the relavent MLIL/HLIL instrutctions --- python/highlevelil.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'python/highlevelil.py') diff --git a/python/highlevelil.py b/python/highlevelil.py index 2a7d2fc7..4a7f3929 100644 --- a/python/highlevelil.py +++ b/python/highlevelil.py @@ -27,7 +27,6 @@ from enum import Enum # Binary Ninja components from . import _binaryninjacore as core from .enums import HighLevelILOperation, DataFlowQueryOption, FunctionGraphType, ILInstructionAttribute -from . import decorators from . import function from . import binaryview from . import architecture @@ -43,7 +42,8 @@ from . import types as _types from .interaction import show_graph_report from .commonil import ( BaseILInstruction, Tailcall, Syscall, Localcall, Comparison, Signed, UnaryOperation, BinaryOperation, SSA, Phi, - Loop, ControlFlow, Memory, Constant, Arithmetic, DoublePrecision, Terminal, FloatingPoint, Intrinsic, Return + Loop, ControlFlow, Memory, Constant, Arithmetic, DoublePrecision, Terminal, FloatingPoint, Intrinsic, Return, + VariableInstruction, SSAVariableInstruction ) from . import deprecation @@ -1378,7 +1378,7 @@ class HighLevelILAssignUnpackMemSsa(HighLevelILInstruction, SSA, Memory): @dataclass(frozen=True, repr=False, eq=False) -class HighLevelILVar(HighLevelILInstruction): +class HighLevelILVar(HighLevelILInstruction, VariableInstruction): @property def var(self) -> 'variable.Variable': return self.get_var(0) @@ -1391,7 +1391,7 @@ class HighLevelILVar(HighLevelILInstruction): @dataclass(frozen=True, repr=False, eq=False) -class HighLevelILVarSsa(HighLevelILInstruction, SSA): +class HighLevelILVarSsa(HighLevelILInstruction, SSAVariableInstruction): @property def var(self) -> 'mediumlevelil.SSAVariable': return self.get_var_ssa(0, 1) -- cgit v1.3.1