Initialize static variables and manually add gc roots

anydream · anydream · commit 497ad9421f85 · 2017-12-28T21:40:32.000+08:00
diff --git a/il2cpp/GeneratorContext.cs b/il2cpp/GeneratorContext.cs
@@ -267,13 +267,58 @@ internal class GeneratorContext
 		public readonly StringGenerator StrGen = new StringGenerator();
 		private readonly HashSet<string> UsedTypeNames = new HashSet<string>();
 		private readonly HashSet<string> UsedMethodNames = new HashSet<string>();
+		private readonly Dictionary<string, List<Tuple<string, bool>>> InitFldsMap = new Dictionary<string, List<Tuple<string, bool>>>();
 		private uint TypeIDCounter;
 
 		public GeneratorContext(TypeManager typeMgr)
 		{
 			TypeMgr = typeMgr;
 		}
 
+		public void AddStaticField(string typeName, string sfldName, bool hasRef)
+		{
+			if (!InitFldsMap.TryGetValue(typeName, out var nameSet))
+			{
+				nameSet = new List<Tuple<string, bool>>();
+				InitFldsMap.Add(typeName, nameSet);
+			}
+			nameSet.Add(new Tuple<string, bool>(sfldName, hasRef));
+		}
+
+		private CompileUnit GenInitUnit(Dictionary<string, string> transMap)
+		{
+			CompileUnit unit = new CompileUnit();
+			unit.Name = "il2cppInit";
+
+			CodePrinter prtGC = new CodePrinter();
+			CodePrinter prtInit = new CodePrinter();
+			foreach (var kv in InitFldsMap)
+			{
+				unit.ImplDepends.Add(transMap[kv.Key]);
+
+				foreach (var item in kv.Value)
+				{
+					if (item.Item2)
+						prtGC.AppendFormatLine("IL2CPP_ADD_ROOT({0});", item.Item1);
+					prtInit.AppendFormatLine("{0} = {{}};", item.Item1);
+				}
+			}
+
+			prtGC.AppendLine("il2cpp_CommitRoots();");
+
+			CodePrinter prtFunc = new CodePrinter();
+			prtFunc.AppendLine("void il2cpp_InitVariables()\n{");
+			++prtFunc.Indents;
+			prtFunc.Append(prtGC.ToString());
+			prtFunc.Append(prtInit.ToString());
+			--prtFunc.Indents;
+			prtFunc.AppendLine("}");
+
+			unit.ImplCode = prtFunc.ToString();
+
+			return unit;
+		}
+
 		public GenerateResult Generate()
 		{
 			var unitMap = new Dictionary<string, CompileUnit>();
@@ -294,6 +339,10 @@ public GenerateResult Generate()
 			if (strTyX != null)
 				StrGen.Generate(unitMap, GetTypeID(strTyX));
 
+			// 生成初始化单元
+			var unitInit = GenInitUnit(transMap);
+			unitMap[unitInit.Name] = unitInit;
+
 			return new GenerateResult(this, unitMap.Values.ToList(), transMap);
 		}
 
diff --git a/il2cpp/Il2cppContext.cs b/il2cpp/Il2cppContext.cs
@@ -105,7 +105,7 @@ public static void SaveToFolder(string folder, List<CompileUnit> units, HashSet<
 			// 生成编译脚本
 			StringBuilder sb = new StringBuilder();
 			sb.AppendLine("@echo off");
-			sb.AppendFormat("BuildTheCode -addcflags \"-DGC_THREADS\" {0} il2cpp.cpp il2cppICall.cpp", addParams);
+			sb.AppendFormat("BuildTheCode -addcflags \"-DGC_THREADS\" {0} il2cpp.cpp il2cppICall.cpp il2cppInit.cpp", addParams);
 			foreach (string unitName in unitNames)
 				sb.AppendFormat(" {0}.cpp", unitName);
 			sb.AppendLine();
diff --git a/il2cpp/TypeGenerator.cs b/il2cpp/TypeGenerator.cs
@@ -19,7 +19,8 @@ public TypeGenerator(GeneratorContext genContext, TypeX tyX)
 		public CompileUnit Generate()
 		{
 			CompileUnit unit = new CompileUnit();
-			unit.Name = GenContext.GetTypeName(CurrType, false);
+			string strTypeName = GenContext.GetTypeName(CurrType, false);
+			unit.Name = strTypeName;
 
 			// 重排字段
 			var fields = LayoutFields(out var sfields);
@@ -61,13 +62,13 @@ public CompileUnit Generate()
 					unit.DeclDepends.Add(strBaseTypeName);
 
 					prtDecl.AppendFormatLine("struct {0} : {1}",
-						GenContext.GetTypeName(CurrType),
+						strTypeName,
 						strBaseTypeName);
 				}
 				else
 				{
 					prtDecl.AppendFormatLine("struct {0}",
-						GenContext.GetTypeName(CurrType));
+						strTypeName);
 				}
 
 				prtDecl.AppendLine("{");
@@ -187,15 +188,19 @@ public CompileUnit Generate()
 			{
 				RefValueTypeDecl(unit, sfldX.FieldType);
 
+				string sfldName = GenContext.GetFieldName(sfldX);
 				string fldDecl = string.Format("{0} {1};",
 					GenContext.GetTypeName(sfldX.FieldType),
-					GenContext.GetFieldName(sfldX));
+					sfldName);
 
 				prtDecl.AppendFormatLine("// {0} -> {1}",
 					Helper.EscapeString(sfldX.DeclType.GetNameKey()),
 					Helper.EscapeString(sfldX.GetReplacedNameKey()));
 				prtDecl.AppendLine("extern " + fldDecl);
 				prtImpl.AppendLine(fldDecl);
+
+				bool hasRef = GenContext.IsRefOrContainsRef(GenContext.GetTypeBySig(sfldX.FieldType));
+				GenContext.AddStaticField(strTypeName, sfldName, hasRef);
 			}
 
 			// 生成类型判断函数
