IDA: Optimize function creation (#75)

Il2CppInspector.Common/Outputs/ScriptResources/Targets/Ghidra.py

@@ -8,7 +8,7 @@ from ghidra.program.model.symbol import SourceType
 def SetName(addr, name):
 	createLabel(toAddr(addr), name, True)
 
-def MakeFunction(start, name=None):
+def MakeFunction(start, name=None, addrMax=None):
 	addr = toAddr(start)
 	# Don't override existing functions
 	fn = getFunctionAt(addr)

Il2CppInspector.Common/Outputs/ScriptResources/Targets/IDA.py

@@ -7,8 +7,16 @@ def SetName(addr, name):
 		new_name = name + '_' + str(addr)
 		ret = idc.set_name(addr, new_name, SN_NOWARN | SN_NOCHECK)
 
-def MakeFunction(start):
+def MakeFunction(start, name=None, addrMax=None):
-  ida_funcs.add_func(start)
+	ida_funcs.add_func(start)
+	#limit end function to maxAddr if any
+	if addrMax is None:
+		return
+	addrEnd = idc.get_func_attr(start,FUNCATTR_END)
+	if addrEnd == idaapi.BADADDR:
+		return
+	if addrEnd > addrMax:
+		idc.set_func_end(start,addrMax)
 
 def MakeArray(addr, numItems, cppType):
 	SetType(addr, cppType)

Il2CppInspector.Common/Outputs/ScriptResources/shared-main.py

@@ -97,8 +97,17 @@ def ProcessJSON(jsonData):
 
 	# Function boundaries
 	print('Processing function boundaries')
-	for d in jsonData['functionAddresses']:
+	functionAddresses = jsonData['functionAddresses']
-		MakeFunction(int(d, 0))
+	functionAddresses.sort()
+	count = len(functionAddresses)
+	for i in range(count):
+		addrStart = int(functionAddresses[i],0)
+		if addrStart == 0:
+			continue
+		addrNext = None
+		if i != count -1:
+			addrNext = int(functionAddresses[i+1],0)
+		MakeFunction(addrStart,None,addrNext)
 
 	# IL2CPP type metadata
 	print('Processing IL2CPP type metadata')