Implement the rest of DTL FFI

Author: CouleeApps

python/function.py

@@ -3334,16 +3334,30 @@ def close(self) -> None:
 		self._function = None
 
 
+@dataclass
+class DisassemblyTextLineTypeInfo:
+	parent_type: Optional['types.Type']
+	field_index: int
+	offset: int
+
+
 @dataclass
 class DisassemblyTextLine:
 	tokens: List['InstructionTextToken']
 	highlight: '_highlight.HighlightColor'
 	address: Optional[int]
 	il_instruction: Optional[ILInstructionType]
+	tags: List['binaryview.Tag']
+	type_info: Optional[DisassemblyTextLineTypeInfo]
 
 	def __init__(
-	    self, tokens: List['InstructionTextToken'], address: Optional[int] = None, il_instr: Optional[ILInstructionType] = None,
-	    color: Optional[Union['_highlight.HighlightColor', HighlightStandardColor]] = None
+			self,
+			tokens: List['InstructionTextToken'],
+			address: Optional[int] = None,
+			il_instr: Optional[ILInstructionType] = None,
+			color: Optional[Union['_highlight.HighlightColor', HighlightStandardColor]] = None,
+			tags: Optional[List['binaryview.Tag']] = None,
+			type_info: Optional[DisassemblyTextLineTypeInfo] = None,
 	):
 		self.address = address
 		self.tokens = tokens
@@ -3358,6 +3372,10 @@ def __init__(
 				self.highlight = _highlight.HighlightColor(color)
 			else:
 				self.highlight = color
+		if tags is None:
+			tags = []
+		self.tags = tags
+		self.type_info = type_info
 
 	def __str__(self):
 		return "".join(map(str, self.tokens))
@@ -3422,7 +3440,30 @@ def _from_core_struct(cls, struct: core.BNDisassemblyTextLine, il_func: Optional
 			except:
 				il_instr = None
 		tokens = InstructionTextToken._from_core_struct(struct.tokens, struct.count)
-		return DisassemblyTextLine(tokens, struct.addr, il_instr, _highlight.HighlightColor._from_core_struct(struct.highlight))
+
+		tags = []
+		for i in range(struct.tagCount):
+			tags.append(binaryview.Tag(handle=core.BNNewTagReference(struct.tags[i])))
+
+		type_info = None
+		if struct.typeInfo.hasTypeInfo:
+			parent_type = None
+			if struct.typeInfo.parentType:
+				parent_type = types.Type.create(core.BNNewTypeReference(struct.typeInfo.parentType))
+			type_info = DisassemblyTextLineTypeInfo(
+				parent_type=parent_type,
+				field_index=struct.typeInfo.fieldIndex,
+				offset=struct.typeInfo.offset
+			)
+
+		return DisassemblyTextLine(
+			tokens,
+			struct.addr,
+			il_instr,
+			_highlight.HighlightColor._from_core_struct(struct.highlight),
+			tags,
+			type_info
+		)
 
 	def _to_core_struct(self) -> core.BNDisassemblyTextLine:
 		result = core.BNDisassemblyTextLine()
@@ -3434,10 +3475,18 @@ def _to_core_struct(self) -> core.BNDisassemblyTextLine:
 		result.tokens = InstructionTextToken._get_core_struct(self.tokens)
 		result.count = len(self.tokens)
 		result.highlight = self.highlight._to_core_struct()
-		result.tagCount = 0  # TODO: Tags?
-		result.tags = None
-		# result.typeInfo =  # TODO: LineTypeInfo ?
-		result.typeInfo.hasTypeInfo = False
+		result.tagCount = len(self.tags)
+		result.tags = (ctypes.POINTER(core.BNTag) * len(self.tags))()
+		for i, tag in enumerate(self.tags):
+			result.tags[i] = tag.handle
+		if self.type_info is None:
+			result.typeInfo.hasTypeInfo = False
+		else:
+			result.typeInfo.hasTypeInfo = True
+			if self.type_info.parent_type is not None:
+				result.typeInfo.parentType = self.type_info.parent_type.handle
+			result.typeInfo.fieldIndex = self.type_info.field_index
+			result.typeInfo.offset = self.type_info.offset
 		return result