charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ProperySiteProcessor: remove static weaverLists references

Browse Source
This commit is contained in:
vis2k 2021-08-19 12:43:33 +08:00
parent cffc983731
commit 55580ba9f3
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs
View File

@ -6,7 +6,7 @@ namespace Mirror.Weaver
{
public static class PropertySiteProcessor
{
public static void Process(ModuleDefinition moduleDef)
public static void Process(ModuleDefinition moduleDef, WeaverLists weaverLists)
{
DateTime startTime = DateTime.Now;
@ -15,28 +15,28 @@ public static void Process(ModuleDefinition moduleDef)
{
if (td.IsClass)
{
ProcessSiteClass(td);
ProcessSiteClass(weaverLists, td);
}
}
Console.WriteLine(" ProcessSitesModule " + moduleDef.Name + " elapsed time:" + (DateTime.Now - startTime));
}
static void ProcessSiteClass(TypeDefinition td)
static void ProcessSiteClass(WeaverLists weaverLists, TypeDefinition td)
{
//Console.WriteLine(" ProcessSiteClass " + td);
foreach (MethodDefinition md in td.Methods)
{
ProcessSiteMethod(md);
ProcessSiteMethod(weaverLists, md);
}
foreach (TypeDefinition nested in td.NestedTypes)
{
ProcessSiteClass(nested);
ProcessSiteClass(weaverLists, nested);
}
}
static void ProcessSiteMethod(MethodDefinition md)
static void ProcessSiteMethod(WeaverLists weaverLists, MethodDefinition md)
{
// process all references to replaced members with properties
//Weaver.DLog(td, " ProcessSiteMethod " + md);
@ -56,20 +56,20 @@ static void ProcessSiteMethod(MethodDefinition md)
for (int iCount = 0; iCount < md.Body.Instructions.Count;)
{
Instruction instr = md.Body.Instructions[iCount];
iCount += ProcessInstruction(md, instr, iCount);
iCount += ProcessInstruction(weaverLists, md, instr, iCount);
}
}
}
// replaces syncvar write access with the NetworkXYZ.get property calls
static void ProcessInstructionSetterField(MethodDefinition md, Instruction i, FieldDefinition opField)
static void ProcessInstructionSetterField(WeaverLists weaverLists, MethodDefinition md, Instruction i, FieldDefinition opField)
{
// don't replace property call sites in constructors
if (md.Name == ".ctor")
return;
// does it set a field that we replaced?
if (Weaver.WeaveLists.replacementSetterProperties.TryGetValue(opField, out MethodDefinition replacement))
if (weaverLists.replacementSetterProperties.TryGetValue(opField, out MethodDefinition replacement))
{
//replace with property
//DLog(td, " replacing " + md.Name + ":" + i);
@ -80,14 +80,14 @@ static void ProcessInstructionSetterField(MethodDefinition md, Instruction i, Fi
}
// replaces syncvar read access with the NetworkXYZ.get property calls
static void ProcessInstructionGetterField(MethodDefinition md, Instruction i, FieldDefinition opField)
static void ProcessInstructionGetterField(WeaverLists weaverLists, MethodDefinition md, Instruction i, FieldDefinition opField)
{
// don't replace property call sites in constructors
if (md.Name == ".ctor")
return;
// does it set a field that we replaced?
if (Weaver.WeaveLists.replacementGetterProperties.TryGetValue(opField, out MethodDefinition replacement))
if (weaverLists.replacementGetterProperties.TryGetValue(opField, out MethodDefinition replacement))
{
//replace with property
//DLog(td, " replacing " + md.Name + ":" + i);
@ -97,38 +97,38 @@ static void ProcessInstructionGetterField(MethodDefinition md, Instruction i, Fi
}
}
static int ProcessInstruction(MethodDefinition md, Instruction instr, int iCount)
static int ProcessInstruction(WeaverLists weaverLists, MethodDefinition md, Instruction instr, int iCount)
{
if (instr.OpCode == OpCodes.Stfld && instr.Operand is FieldDefinition opFieldst)
{
// this instruction sets the value of a field. cache the field reference.
ProcessInstructionSetterField(md, instr, opFieldst);
ProcessInstructionSetterField(weaverLists, md, instr, opFieldst);
}
if (instr.OpCode == OpCodes.Ldfld && instr.Operand is FieldDefinition opFieldld)
{
// this instruction gets the value of a field. cache the field reference.
ProcessInstructionGetterField(md, instr, opFieldld);
ProcessInstructionGetterField(weaverLists, md, instr, opFieldld);
}
if (instr.OpCode == OpCodes.Ldflda && instr.Operand is FieldDefinition opFieldlda)
{
// loading a field by reference, watch out for initobj instruction
// see https://github.com/vis2k/Mirror/issues/696
return ProcessInstructionLoadAddress(md, instr, opFieldlda, iCount);
return ProcessInstructionLoadAddress(weaverLists, md, instr, opFieldlda, iCount);
}
return 1;
}
static int ProcessInstructionLoadAddress(MethodDefinition md, Instruction instr, FieldDefinition opField, int iCount)
static int ProcessInstructionLoadAddress(WeaverLists weaverLists, MethodDefinition md, Instruction instr, FieldDefinition opField, int iCount)
{
// don't replace property call sites in constructors
if (md.Name == ".ctor")
return 1;
// does it set a field that we replaced?
if (Weaver.WeaveLists.replacementSetterProperties.TryGetValue(opField, out MethodDefinition replacement))
if (weaverLists.replacementSetterProperties.TryGetValue(opField, out MethodDefinition replacement))
{
// we have a replacement for this property
// is the next instruction a initobj?

2
Assets/Mirror/Editor/Weaver/Weaver.cs
View File

@ -180,7 +180,7 @@ public static bool Weave(AssemblyDefinition asmDef)
if (modified)
{
PropertySiteProcessor.Process(moduleDefinition);
PropertySiteProcessor.Process(moduleDefinition, WeaveLists);
// add class that holds read/write functions
moduleDefinition.Types.Add(GeneratedCodeClass);