diff options
| -rw-r--r-- | python/highlevelil.py | 12 | ||||
| -rw-r--r-- | python/mediumlevelil.py | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/python/highlevelil.py b/python/highlevelil.py index dc16e333..101b2e9f 100644 --- a/python/highlevelil.py +++ b/python/highlevelil.py @@ -215,8 +215,8 @@ class HighLevelILInstruction(BaseILInstruction): ("constant", "int"), ("offset", "int") ], HighLevelILOperation.HLIL_FLOAT_CONST: [("constant", "float")], HighLevelILOperation.HLIL_IMPORT: [ ("constant", "int") - ], HighLevelILOperation.HLIL_CONST_DATA: [("constant_data", "constant_data")], HighLevelILOperation.HLIL_CONST_DATA: [ - ("constant_data", "constant_data") + ], HighLevelILOperation.HLIL_CONST_DATA: [("constant", "ConstantData")], HighLevelILOperation.HLIL_CONST_DATA: [ + ("constant", "ConstantData") ], HighLevelILOperation.HLIL_ADD: [("left", "expr"), ("right", "expr")], HighLevelILOperation.HLIL_ADC: [ ("left", "expr"), ("right", "expr"), ("carry", "expr") ], HighLevelILOperation.HLIL_SUB: [("left", "expr"), ("right", "expr")], HighLevelILOperation.HLIL_SBB: [ @@ -1812,13 +1812,17 @@ class HighLevelILImport(HighLevelILInstruction, Constant): @dataclass(frozen=True, repr=False, eq=False) class HighLevelILConstData(HighLevelILInstruction, Constant): @property + def constant(self) -> variable.ConstantData: + return self.get_constant_data(0, 1) + + @property def constant_data(self) -> variable.ConstantData: return self.get_constant_data(0, 1) @property def detailed_operands(self) -> List[Tuple[str, HighLevelILOperandType, str]]: return [ - ("constant_data", self.constant_data, "ConstantData"), + ("constant", self.constant, "ConstantData"), ] @@ -2422,7 +2426,7 @@ ILInstruction = { HighLevelILOperation.HLIL_EXTERN_PTR: HighLevelILExternPtr, # ("constant", "int"), ("offset", "int"), HighLevelILOperation.HLIL_FLOAT_CONST: HighLevelILFloatConst, # ("constant", "float"), HighLevelILOperation.HLIL_IMPORT: HighLevelILImport, # ("constant", "int"), - HighLevelILOperation.HLIL_CONST_DATA: HighLevelILConstData, # [("constant_data", "constant_data")], + HighLevelILOperation.HLIL_CONST_DATA: HighLevelILConstData, # [("constant", "ConstantData")], HighLevelILOperation.HLIL_ADD: HighLevelILAdd, # ("left", "expr"), ("right", "expr"), HighLevelILOperation.HLIL_ADC: HighLevelILAdc, # ("left", "expr"), ("right", "expr"), ("carry", "expr"), HighLevelILOperation.HLIL_SUB: HighLevelILSub, # ("left", "expr"), ("right", "expr"), diff --git a/python/mediumlevelil.py b/python/mediumlevelil.py index 776e9e17..7d60abd1 100644 --- a/python/mediumlevelil.py +++ b/python/mediumlevelil.py @@ -202,8 +202,8 @@ class MediumLevelILInstruction(BaseILInstruction): ("constant", "int"), ("offset", "int") ], MediumLevelILOperation.MLIL_FLOAT_CONST: [("constant", "float")], MediumLevelILOperation.MLIL_IMPORT: [ ("constant", "int") - ], MediumLevelILOperation.MLIL_CONST_DATA: [("constant_data", "constant_data")], MediumLevelILOperation.MLIL_CONST_DATA: [ - ("constant_data", "constant_data") + ], MediumLevelILOperation.MLIL_CONST_DATA: [("constant", "ConstantData")], MediumLevelILOperation.MLIL_CONST_DATA: [ + ("constant", "ConstantData") ], MediumLevelILOperation.MLIL_ADD: [("left", "expr"), ("right", "expr")], MediumLevelILOperation.MLIL_ADC: [ ("left", "expr"), ("right", "expr"), ("carry", "expr") ], MediumLevelILOperation.MLIL_SUB: [("left", "expr"), ("right", "expr")], MediumLevelILOperation.MLIL_SBB: [ @@ -1319,12 +1319,16 @@ class MediumLevelILImport(MediumLevelILConstBase): @dataclass(frozen=True, repr=False, eq=False) class MediumLevelILConstData(MediumLevelILConstBase): @property + def constant(self) -> variable.ConstantData: + return self._get_constant_data(0, 1) + + @property def constant_data(self) -> variable.ConstantData: return self._get_constant_data(0, 1) @property def detailed_operands(self) -> List[Tuple[str, MediumLevelILOperandType, str]]: - return [("constant_data", self.constant_data, "ConstantData")] + return [("constant", self.constant, "ConstantData")] @dataclass(frozen=True, repr=False, eq=False) @@ -3067,7 +3071,7 @@ ILInstruction = { MediumLevelILOperation.MLIL_CONST_PTR: MediumLevelILConstPtr, # [("constant", "int")], MediumLevelILOperation.MLIL_FLOAT_CONST: MediumLevelILFloatConst, # [("constant", "float")], MediumLevelILOperation.MLIL_IMPORT: MediumLevelILImport, # [("constant", "int")], - MediumLevelILOperation.MLIL_CONST_DATA: MediumLevelILConstData, # [("constant_data", "constant_data")], + MediumLevelILOperation.MLIL_CONST_DATA: MediumLevelILConstData, # [("constant", "ConstData")], MediumLevelILOperation.MLIL_SET_VAR: MediumLevelILSetVar, # [("dest", "var"), ("src", "expr")], MediumLevelILOperation.MLIL_LOAD_STRUCT: MediumLevelILLoadStruct, # [("src", "expr"), ("offset", "int")], MediumLevelILOperation.MLIL_STORE: MediumLevelILStore, # [("dest", "expr"), ("src", "expr")], |