Skip to content

Relinker: handle vars/params & generics; fix by-ref hook/delegate emission #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CedaryCat wants to merge 3 commits into
base: default
Choose a base branch
from
+81 −43
Open

Relinker: handle vars/params & generics; fix by-ref hook/delegate emission #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87074a6
Relinker: handle variables & parameters
CedaryCat Jan 31, 2026
8786238
Handle generic constraints and method overrides in relinker
CedaryCat Jan 31, 2026
fb7030d
Fix by-ref parameter handling in hook/delegate emission
CedaryCat Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions ModFramework/Emitters/HookEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ static string GetUniqueName(MethodDefinition method)
name += "_" + string.Join("_", method.Parameters.Select(y =>
{
var name = y.ParameterType.Name;
if (y.ParameterType.IsByReference)
name = $"{y.ParameterType.GetElementType().Name}ByRef";
if (y.ParameterType is ByReferenceType byref)
name = $"{byref.ElementType.Name}ByRef";
return name;
}));
}
Expand Down Expand Up @@ -133,7 +133,7 @@ static TypeDefinition CreateHookEventArgs(TypeDefinition hookType, MethodDefinit
// for each parameter in the method, create a field
foreach (var param in hookDefinition.Parameters)
{
var paramType = param.ParameterType.IsByReference ? param.ParameterType.GetElementType() : param.ParameterType;
var paramType = param.ParameterType is ByReferenceType byref ? byref.ElementType : param.ParameterType;
FieldDefinition paramField = new(param.Name, FieldAttributes.Public, paramType);
hookEvent.Fields.Add(paramField);
}
Expand Down Expand Up @@ -254,7 +254,7 @@ public static TypeDefinition GetOrCreateOriginalMethodDelegate(MonoModder modder
};

foreach (var param in originalDefinition.Parameters)
invoke.Parameters.Add(new(param.Name, ParameterAttributes.None, param.ParameterType));
invoke.Parameters.Add(param.ClonePreservingInOut());

delegateType.Methods.Add(invoke);

Expand All @@ -266,7 +266,7 @@ public static TypeDefinition GetOrCreateOriginalMethodDelegate(MonoModder modder
IsRuntime = true
};
foreach (var param in originalDefinition.Parameters)
beginInvoke.Parameters.Add(new(param.Name, ParameterAttributes.None, param.ParameterType));
beginInvoke.Parameters.Add(param.ClonePreservingInOut());
beginInvoke.Parameters.Add(new("callback", ParameterAttributes.None, iAsyncCallback));
beginInvoke.Parameters.Add(new("object", ParameterAttributes.None, delegateType.Module.TypeSystem.Object));
delegateType.Methods.Add(beginInvoke);
Expand Down Expand Up @@ -495,7 +495,7 @@ static MethodDefinition CreateReplacement(MethodDefinition original, MethodDefin
// if any out parameters, initialise them with default values
foreach (var param in methodDefinition.Parameters.Where(x => x.IsOut))
{
var type = param.ParameterType.GetElementType();
var type = ((ByReferenceType)param.ParameterType).ElementType;
il.Emit(OpCodes.Ldarg_S, param);
var defaultValue = CreateDefaultValueInstruction(type);
il.Append(defaultValue);
Expand All @@ -510,14 +510,15 @@ static MethodDefinition CreateReplacement(MethodDefinition original, MethodDefin
il.Emit(OpCodes.Ldftn, original);
il.Emit(OpCodes.Newobj, originalMethodField.FieldType.Resolve().Methods.Single(x => x.Name == ".ctor"));

for (int i = 0; i < methodDefinition.Parameters.Count; i++)
foreach (var param in methodDefinition.Parameters)
{
var isByRef = methodDefinition.Parameters[i].ParameterType.IsByReference;
var opCode = isByRef ? OpCodes.Ldarg_S : OpCodes.Ldarg;
il.Emit(opCode, methodDefinition.Parameters[i]);
if (isByRef)
il.Append(CreateLoadIndirectInstruction(methodDefinition.Parameters[i].ParameterType.GetElementType()));
il.Emit(OpCodes.Ldarg_S, param);
if (param.ParameterType is ByReferenceType byRefType)
{
il.Append(CreateLoadIndirectInstruction(byRefType.ElementType));
}
}

il.Emit(OpCodes.Call, eventInvoke);

// store the event args in a local variable
Expand All @@ -530,7 +531,7 @@ static MethodDefinition CreateReplacement(MethodDefinition original, MethodDefin
il.Emit(OpCodes.Ldarg_S, param);
il.Emit(OpCodes.Ldloc, eventArgsVariable);
il.Emit(OpCodes.Ldfld, field);
il.Append(CreateStoreIndirectFunction(field.FieldType.GetElementType()));
il.Append(CreateStoreIndirectFunction(field.FieldType));
}

// use ContinueExecutionName to determine whether to continue or not
Expand Down
6 changes: 6 additions & 0 deletions ModFramework/Extensions/Replacement.Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,10 @@ public static PropertyDefinition Clone(this PropertyDefinition property)

return prop;
}

public static ParameterDefinition ClonePreservingInOut(this ParameterDefinition p)
{
var attrs = p.Attributes & (ParameterAttributes.In | ParameterAttributes.Out);
return new ParameterDefinition(p.Name, attrs, p.ParameterType);
}
}
12 changes: 12 additions & 0 deletions ModFramework/Relinker/ArrayToCollectionRelinker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,18 @@ public override void Relink(PropertyDefinition property)
property.PropertyType = ICollectionGen;
}

public override void Relink(MethodDefinition method, VariableDefinition variable)
{
if (variable.VariableType is ArrayType arrayType && arrayType.ElementType.FullName == this.Type.FullName)
variable.VariableType = ICollectionGen;
}

public override void Relink(MethodDefinition method, ParameterDefinition parameter)
{
if (parameter.ParameterType is ArrayType arrayType && arrayType.ElementType.FullName == this.Type.FullName)
parameter.ParameterType = ICollectionGen;
}

public override void Relink(MethodBody body, Instruction instr)
{
if (body.Method.ReturnType is ArrayType arrayType && arrayType.ElementType.FullName == this.Type.FullName)
Expand Down
79 changes: 49 additions & 30 deletions ModFramework/Relinker/TypeRelinker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,14 @@ bool CheckType<TRef>(TRef type, Action<TRef>? update = null)
}
else
{
// TODO determine if this is needed anymore. causes recursion issues but i dont see evidence its needed anymore
//if (type.HasGenericParameters)
// for (int i = 0; i < type.GenericParameters.Count; i++)
// {
// changed |= CheckType(
// type.GenericParameters[i],
// nr => type.GenericParameters[i] = nr
// );
// }
foreach (var gpm in type.GenericParameters)
{
foreach (var ct in gpm.Constraints)
{
FixAttributes(ct.CustomAttributes);
changed |= CheckType(ct.ConstraintType, ntype => ct.ConstraintType = ntype);
}
}

changed |= RelinkType(ref type);
}
Expand All @@ -125,34 +124,49 @@ bool CheckType<TRef>(TRef type, Action<TRef>? update = null)
return changed;
}

public abstract bool RelinkType<TRef>(ref TRef typeReference) where TRef : TypeReference;

public void Relink(Instruction instr)
private void CheckMethodRef(MethodReference mref)
{
if (instr.Operand is MethodReference mref)
if (mref is GenericInstanceMethod gim)
{
if (mref is GenericInstanceMethod gim)
CheckType(gim.ElementMethod.DeclaringType, nt => gim.ElementMethod.DeclaringType = nt);

for (var x = 0; x < gim.GenericArguments.Count; x++)
{
CheckType(gim.ElementMethod.DeclaringType, nt => gim.ElementMethod.DeclaringType = nt);
CheckType(gim.GenericArguments[x], nt => gim.GenericArguments[x] = nt);

if (gim.GenericArguments[x].DeclaringType is not null)
CheckType(gim.GenericArguments[x].DeclaringType, nt =>
{
if (gim.GenericArguments[x] is GenericParameter gp)
{
gim.GenericArguments[x] = nt.GenericParameters[gp.Position];
}
else
{
gim.GenericArguments[x].DeclaringType = nt;
}
});
}
}
else
CheckType(mref.DeclaringType, nt => mref.DeclaringType = nt);

for (var x = 0; x < gim.GenericArguments.Count; x++)
{
CheckType(gim.GenericArguments[x], nt => gim.GenericArguments[x] = nt);
CheckType(mref.ReturnType, nt => mref.ReturnType = nt);

if (gim.GenericArguments[x].DeclaringType is not null)
CheckType(gim.GenericArguments[x].DeclaringType, nt => gim.GenericArguments[x].DeclaringType = nt);
}
}
else
CheckType(mref.DeclaringType, nt => mref.DeclaringType = nt);
foreach (var prm in mref.Parameters)
{
CheckType(prm.ParameterType, nt => prm.ParameterType = nt);
FixAttributes(prm.CustomAttributes);
}
}

CheckType(mref.ReturnType, nt => mref.ReturnType = nt);
public abstract bool RelinkType<TRef>(ref TRef typeReference) where TRef : TypeReference;

foreach (var prm in mref.Parameters)
{
CheckType(prm.ParameterType, nt => prm.ParameterType = nt);
FixAttributes(prm.CustomAttributes);
}
public void Relink(Instruction instr)
{
if (instr.Operand is MethodReference mref)
{
CheckMethodRef(mref);
}
else if (instr.Operand is FieldReference fref)
{
Expand Down Expand Up @@ -298,6 +312,11 @@ public override void Relink(MethodDefinition method)
FixAttributes(prm.CustomAttributes);
}

foreach (var ovrd in method.Overrides)
{
CheckMethodRef(ovrd);
}

FixAttributes(method.CustomAttributes);

CheckType(method.MethodReturnType.ReturnType, nt => method.MethodReturnType.ReturnType = nt);
Expand Down