Bump version

Fix AddLoadIndirect and AddStoreIndirect
* Resolves #1
2026-11-13 12:41:25 -10:00 · 2025-01-11 01:07:46 -08:00 · 2025-01-11 01:07:24 -08:00 · 2025-01-10 23:47:59 -08:00 · 2025-01-10 23:46:05 -08:00 · 2025-01-10 23:45:32 -08:00
34 changed files with 1733 additions and 95 deletions
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net9.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\AssetRipper.CIL\AssetRipper.CIL.csproj" />
+	</ItemGroup>
+
+</Project>
@@ -0,0 +1,18 @@
+using AsmResolver.DotNet;
+
+namespace AssetRipper.CIL.Standardizer
+{
+	internal class Program
+	{
+		static void Main(string[] args)
+		{
+			ModuleDefinition module = ModuleDefinition.FromFile(args[0]);
+			foreach (MethodDefinition method in module.GetAllTypes().SelectMany(t => t.Methods))
+			{
+				method.CilMethodBody?.Instructions.StandardizeMacros();
+			}
+			module.Write(args[1]);
+			Console.WriteLine("Done!");
+		}
+	}
+}
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net9.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\AssetRipper.CIL\AssetRipper.CIL.csproj" />
+	</ItemGroup>
+
+</Project>
@@ -0,0 +1,18 @@
+using AsmResolver.DotNet;
+
+namespace AssetRipper.CIL.Stubber
+{
+	internal class Program
+	{
+		static void Main(string[] args)
+		{
+			ModuleDefinition module = ModuleDefinition.FromFile(args[0]);
+			foreach (MethodDefinition method in module.GetAllTypes().SelectMany(t => t.Methods))
+			{
+				method.ReplaceMethodBodyWithMinimalImplementation();
+			}
+			module.Write(args[1]);
+			Console.WriteLine("Done!");
+		}
+	}
+}
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="coverlet.collector" Version="6.0.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="4.3.2" />
+		<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\AssetRipper.CIL\AssetRipper.CIL.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="NUnit.Framework" />
+	</ItemGroup>
+
+</Project>
@@ -0,0 +1,113 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.DotNet.Signatures;
+using AsmResolver.PE.DotNet.Cil;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+
+namespace AssetRipper.CIL.Tests;
+
+public class LoadIndirectTests
+{
+	[TestCase(ElementType.I1, CilCode.Ldind_I1)]
+	[TestCase(ElementType.I2, CilCode.Ldind_I2)]
+	[TestCase(ElementType.I4, CilCode.Ldind_I4)]
+	[TestCase(ElementType.I8, CilCode.Ldind_I8)]
+	[TestCase(ElementType.U1, CilCode.Ldind_U1)]
+	[TestCase(ElementType.U2, CilCode.Ldind_U2)]
+	[TestCase(ElementType.U4, CilCode.Ldind_U4)]
+	[TestCase(ElementType.U8, CilCode.Ldind_I8)]
+	[TestCase(ElementType.I, CilCode.Ldind_I)]
+	[TestCase(ElementType.U, CilCode.Ldind_I)]
+	[TestCase(ElementType.R4, CilCode.Ldind_R4)]
+	[TestCase(ElementType.R8, CilCode.Ldind_R8)]
+	[TestCase(ElementType.Boolean, CilCode.Ldind_U1)]
+	[TestCase(ElementType.Char, CilCode.Ldind_U2)]
+	[TestCase(ElementType.Object, CilCode.Ldind_Ref)]
+	[TestCase(ElementType.String, CilCode.Ldind_Ref)]
+	[TestCase(ElementType.TypedByRef, CilCode.Ldobj)]
+	public void CorlibLoadIndirect(ElementType type, CilCode code)
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		CorLibTypeSignature? typeToLoad = module.CorLibTypeFactory.FromElementType(type);
+		Assert.That(typeToLoad, Is.Not.Null);
+		AssertCorrectLoadIndirect(typeToLoad, code);
+	}
+
+	[TestCase(ElementType.I1, CilCode.Ldind_I1)]
+	[TestCase(ElementType.I2, CilCode.Ldind_I2)]
+	[TestCase(ElementType.I4, CilCode.Ldind_I4)]
+	[TestCase(ElementType.I8, CilCode.Ldind_I8)]
+	[TestCase(ElementType.U1, CilCode.Ldind_U1)]
+	[TestCase(ElementType.U2, CilCode.Ldind_U2)]
+	[TestCase(ElementType.U4, CilCode.Ldind_U4)]
+	[TestCase(ElementType.U8, CilCode.Ldind_I8)]
+	public void EnumLoadIndirect(ElementType type, CilCode code)
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeSignature? typeToLoad = CreateEnum(module, type).ToTypeSignature();
+		Assert.That(typeToLoad, Is.Not.Null);
+		AssertCorrectLoadIndirect(typeToLoad, code);
+	}
+
+	[Test]
+	public void PointerLoadIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		PointerTypeSignature typeToLoad = module.CorLibTypeFactory.Void.MakePointerType();
+		AssertCorrectLoadIndirect(typeToLoad, CilCode.Ldind_I);
+	}
+
+	[Test]
+	public void GenericParameterLoadIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		GenericParameterSignature typeToLoad = new GenericParameterSignature(module, GenericParameterType.Type, 0);
+		AssertCorrectLoadIndirect(typeToLoad, CilCode.Ldobj);
+	}
+
+	[Test]
+	public void SzArrayLoadIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeSignature typeToLoad = module.CorLibTypeFactory.Int32.MakeSzArrayType();
+		AssertCorrectLoadIndirect(typeToLoad, CilCode.Ldind_Ref);
+	}
+
+	[Test]
+	public void ClassLoadIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeDefinition type = new TypeDefinition("TestNamespace", "TestName", TypeAttributes.Public, module.CorLibTypeFactory.Object.ToTypeDefOrRef());
+		module.TopLevelTypes.Add(type);
+		AssertCorrectLoadIndirect(type.ToTypeSignature(), CilCode.Ldind_Ref);
+	}
+
+	[Test]
+	public void StructLoadIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeDefinition type = new TypeDefinition("TestNamespace", "TestName", TypeAttributes.Public | TypeAttributes.SequentialLayout | TypeAttributes.Sealed, module.DefaultImporter.ImportType(typeof(ValueType)));
+		module.TopLevelTypes.Add(type);
+		AssertCorrectLoadIndirect(type.ToTypeSignature(), CilCode.Ldobj);
+	}
+
+	private static void AssertCorrectLoadIndirect(TypeSignature typeToLoad, CilCode expectedOpCode)
+	{
+		MethodDefinition method = new MethodDefinition("Test", MethodAttributes.Public | MethodAttributes.Static, null);
+		method.CilMethodBody = new(method);
+		CilInstructionCollection instructions = method.CilMethodBody.Instructions;
+		instructions.AddLoadIndirect(typeToLoad);
+		Assert.That(instructions, Has.Count.EqualTo(1));
+		Assert.That(instructions[0].OpCode.Code, Is.EqualTo(expectedOpCode));
+	}
+
+	private static TypeDefinition CreateEnum(ModuleDefinition module, ElementType underlyingType)
+	{
+		TypeDefinition enumType = new TypeDefinition("TestNamespace", "TestEnum", TypeAttributes.Public, module.DefaultImporter.ImportType(typeof(Enum)));
+		module.TopLevelTypes.Add(enumType);
+		CorLibTypeSignature underlyingTypeSignature = module.CorLibTypeFactory.FromElementType(underlyingType) ?? throw new NullReferenceException();
+		FieldDefinition valueField = new FieldDefinition("value__", FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RuntimeSpecialName, underlyingTypeSignature);
+		enumType.Fields.Add(valueField);
+		return enumType;
+	}
+}
@@ -0,0 +1,113 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.DotNet.Signatures;
+using AsmResolver.PE.DotNet.Cil;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+
+namespace AssetRipper.CIL.Tests;
+
+public class StoreIndirectTests
+{
+	[TestCase(ElementType.I1, CilCode.Stind_I1)]
+	[TestCase(ElementType.I2, CilCode.Stind_I2)]
+	[TestCase(ElementType.I4, CilCode.Stind_I4)]
+	[TestCase(ElementType.I8, CilCode.Stind_I8)]
+	[TestCase(ElementType.U1, CilCode.Stind_I1)]
+	[TestCase(ElementType.U2, CilCode.Stind_I2)]
+	[TestCase(ElementType.U4, CilCode.Stind_I4)]
+	[TestCase(ElementType.U8, CilCode.Stind_I8)]
+	[TestCase(ElementType.I, CilCode.Stind_I)]
+	[TestCase(ElementType.U, CilCode.Stind_I)]
+	[TestCase(ElementType.R4, CilCode.Stind_R4)]
+	[TestCase(ElementType.R8, CilCode.Stind_R8)]
+	[TestCase(ElementType.Boolean, CilCode.Stind_I1)]
+	[TestCase(ElementType.Char, CilCode.Stind_I2)]
+	[TestCase(ElementType.Object, CilCode.Stind_Ref)]
+	[TestCase(ElementType.String, CilCode.Stind_Ref)]
+	[TestCase(ElementType.TypedByRef, CilCode.Stobj)]
+	public void CorlibStoreIndirect(ElementType type, CilCode code)
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		CorLibTypeSignature? typeToStore = module.CorLibTypeFactory.FromElementType(type);
+		Assert.That(typeToStore, Is.Not.Null);
+		AssertCorrectStoreIndirect(typeToStore, code);
+	}
+
+	[TestCase(ElementType.I1, CilCode.Stind_I1)]
+	[TestCase(ElementType.I2, CilCode.Stind_I2)]
+	[TestCase(ElementType.I4, CilCode.Stind_I4)]
+	[TestCase(ElementType.I8, CilCode.Stind_I8)]
+	[TestCase(ElementType.U1, CilCode.Stind_I1)]
+	[TestCase(ElementType.U2, CilCode.Stind_I2)]
+	[TestCase(ElementType.U4, CilCode.Stind_I4)]
+	[TestCase(ElementType.U8, CilCode.Stind_I8)]
+	public void EnumStoreIndirect(ElementType type, CilCode code)
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeSignature? typeToStore = CreateEnum(module, type).ToTypeSignature();
+		Assert.That(typeToStore, Is.Not.Null);
+		AssertCorrectStoreIndirect(typeToStore, code);
+	}
+
+	[Test]
+	public void PointerStoreIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		PointerTypeSignature typeToStore = module.CorLibTypeFactory.Void.MakePointerType();
+		AssertCorrectStoreIndirect(typeToStore, CilCode.Stind_I);
+	}
+
+	[Test]
+	public void GenericParameterStoreIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		GenericParameterSignature typeToStore = new GenericParameterSignature(module, GenericParameterType.Type, 0);
+		AssertCorrectStoreIndirect(typeToStore, CilCode.Stobj);
+	}
+
+	[Test]
+	public void SzArrayStoreIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeSignature typeToStore = module.CorLibTypeFactory.Int32.MakeSzArrayType();
+		AssertCorrectStoreIndirect(typeToStore, CilCode.Stind_Ref);
+	}
+
+	[Test]
+	public void ClassStoreIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeDefinition type = new TypeDefinition("TestNamespace", "TestName", TypeAttributes.Public, module.CorLibTypeFactory.Object.ToTypeDefOrRef());
+		module.TopLevelTypes.Add(type);
+		AssertCorrectStoreIndirect(type.ToTypeSignature(), CilCode.Stind_Ref);
+	}
+
+	[Test]
+	public void StructStoreIndirect()
+	{
+		ModuleDefinition module = new ModuleDefinition("TestModule");
+		TypeDefinition type = new TypeDefinition("TestNamespace", "TestName", TypeAttributes.Public | TypeAttributes.SequentialLayout | TypeAttributes.Sealed, module.DefaultImporter.ImportType(typeof(ValueType)));
+		module.TopLevelTypes.Add(type);
+		AssertCorrectStoreIndirect(type.ToTypeSignature(), CilCode.Stobj);
+	}
+
+	private static void AssertCorrectStoreIndirect(TypeSignature typeToStore, CilCode expectedOpCode)
+	{
+		MethodDefinition method = new MethodDefinition("Test", MethodAttributes.Public | MethodAttributes.Static, null);
+		method.CilMethodBody = new(method);
+		CilInstructionCollection instructions = method.CilMethodBody.Instructions;
+		instructions.AddStoreIndirect(typeToStore);
+		Assert.That(instructions, Has.Count.EqualTo(1));
+		Assert.That(instructions[0].OpCode.Code, Is.EqualTo(expectedOpCode));
+	}
+
+	private static TypeDefinition CreateEnum(ModuleDefinition module, ElementType underlyingType)
+	{
+		TypeDefinition enumType = new TypeDefinition("TestNamespace", "TestEnum", TypeAttributes.Public, module.DefaultImporter.ImportType(typeof(Enum)));
+		module.TopLevelTypes.Add(enumType);
+		CorLibTypeSignature underlyingTypeSignature = module.CorLibTypeFactory.FromElementType(underlyingType) ?? throw new NullReferenceException();
+		FieldDefinition valueField = new FieldDefinition("value__", FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RuntimeSpecialName, underlyingTypeSignature);
+		enumType.Fields.Add(valueField);
+		return enumType;
+	}
+}
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net9.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\AssetRipper.CIL\AssetRipper.CIL.csproj" />
+	</ItemGroup>
+
+</Project>
@@ -0,0 +1,177 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.DotNet.Collections;
+using AsmResolver.DotNet.Signatures;
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Validator;
+
+public static class CilInstructionCollectionEquality
+{
+	public static bool Equals(CilMethodBody left, CilMethodBody right)
+	{
+		// Local Variables
+		if (left.LocalVariables.Count != right.LocalVariables.Count)
+		{
+			return false;
+		}
+		for (int i = 0; i < left.LocalVariables.Count; i++)
+		{
+			if (!SignatureComparer.Default.Equals(left.LocalVariables[i].VariableType, right.LocalVariables[i].VariableType))
+			{
+				return false;
+			}
+		}
+
+		// Exception Handlers
+		if (left.ExceptionHandlers.Count != right.ExceptionHandlers.Count)
+		{
+			return false;
+		}
+		for (int i = 0; i < left.ExceptionHandlers.Count; i++)
+		{
+			if (!Equals(left.ExceptionHandlers[i], right.ExceptionHandlers[i]))
+			{
+				return false;
+			}
+		}
+
+		// Instructions
+		return Equals(left.Instructions, right.Instructions); 
+	}
+
+	public static bool Equals(CilExceptionHandler left, CilExceptionHandler right)
+	{
+		return left.HandlerType == right.HandlerType
+			&& left.TryStart?.Offset == right.TryStart?.Offset
+			&& left.TryEnd?.Offset == right.TryEnd?.Offset
+			&& left.HandlerStart?.Offset == right.HandlerStart?.Offset
+			&& left.HandlerEnd?.Offset == right.HandlerEnd?.Offset
+			&& left.FilterStart?.Offset == right.FilterStart?.Offset
+			&& SignatureComparer.Default.Equals(left.ExceptionType, right.ExceptionType);
+	}
+
+	public static bool Equals(CilInstructionCollection left, CilInstructionCollection right)
+	{
+		if (left.Count != right.Count)
+		{
+			return false;
+		}
+
+		for (int i = 0; i < left.Count; i++)
+		{
+			CilInstruction leftInstruction = left[i];
+			CilInstruction rightInstruction = right[i];
+			if (leftInstruction.OpCode != rightInstruction.OpCode || leftInstruction.Operand?.GetType() != rightInstruction.Operand?.GetType())
+			{
+				return false;
+			}
+
+			if (rightInstruction.Operand is null)
+			{
+				// Both operands are null because of the type check.
+				continue;
+			}
+
+			switch (leftInstruction.Operand)
+			{
+				case CilInstructionLabel leftLabel:
+					{
+						CilInstructionLabel rightLabel = (CilInstructionLabel)rightInstruction.Operand;
+						int leftIndex = leftLabel.Instruction is null ? -1 : left.IndexOf(leftLabel.Instruction);
+						int rightIndex = rightLabel.Instruction is null ? -1 : right.IndexOf(rightLabel.Instruction);
+
+						if (leftIndex != rightIndex)
+						{
+							return false;
+						}
+					}
+					break;
+				case CilInstructionLabel[] leftLabels:
+					{
+						CilInstructionLabel[] rightLabels = (CilInstructionLabel[])rightInstruction.Operand;
+						if (leftLabels.Length != rightLabels.Length)
+						{
+							return false;
+						}
+
+						for (int j = 0; j < leftLabels.Length; j++)
+						{
+							CilInstructionLabel leftLabel = leftLabels[j];
+							CilInstructionLabel rightLabel = rightLabels[j];
+							int leftIndex = leftLabel.Instruction is null ? -1 : left.IndexOf(leftLabel.Instruction);
+							int rightIndex = rightLabel.Instruction is null ? -1 : right.IndexOf(rightLabel.Instruction);
+
+							if (leftIndex != rightIndex)
+							{
+								return false;
+							}
+						}
+					}
+					break;
+				case Parameter leftParameter:
+					{
+						Parameter rightParameter = (Parameter)rightInstruction.Operand;
+						if (leftParameter.Index != rightParameter.Index)
+						{
+							return false;
+						}
+					}
+					break;
+				case CilLocalVariable leftVariable:
+					{
+						CilLocalVariable rightVariable = (CilLocalVariable)rightInstruction.Operand;
+						if (left.Owner.LocalVariables.IndexOf(leftVariable) != right.Owner.LocalVariables.IndexOf(rightVariable))
+						{
+							return false;
+						}
+					}
+					break;
+				case MemberReference leftMember:
+					{
+						MemberReference rightMember = (MemberReference)rightInstruction.Operand;
+						if (!SignatureComparer.Default.Equals(leftMember, rightMember))
+						{
+							return false;
+						}
+					}
+					break;
+				case IFieldDescriptor leftField:
+					{
+						IFieldDescriptor rightField = (IFieldDescriptor)rightInstruction.Operand;
+						if (!SignatureComparer.Default.Equals(leftField, rightField))
+						{
+							return false;
+						}
+					}
+					break;
+				case ITypeDefOrRef leftType:
+					{
+						ITypeDefOrRef rightType = (ITypeDefOrRef)rightInstruction.Operand;
+						if (!SignatureComparer.Default.Equals(leftType, rightType))
+						{
+							return false;
+						}
+					}
+					break;
+				case IMethodDescriptor leftMethod:
+					{
+						IMethodDescriptor rightMethod = (IMethodDescriptor)rightInstruction.Operand;
+						if (!SignatureComparer.Default.Equals(leftMethod, rightMethod))
+						{
+							return false;
+						}
+					}
+					break;
+				default:
+					if (!leftInstruction.Operand!.Equals(rightInstruction.Operand))
+					{
+						return false;
+					}
+					break;
+			}
+		}
+
+		return true;
+	}
+}
@@ -0,0 +1,236 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Signatures;
+
+namespace AssetRipper.CIL.Validator;
+
+internal class Program
+{
+	static void Main(string[] args)
+	{
+		ModuleDefinition module1 = ModuleDefinition.FromFile(args[0]);
+		ModuleDefinition module2 = ModuleDefinition.FromFile(args[1]);
+
+		List<TypeDefinition> typesMissingFrom1 = new();
+		List<TypeDefinition> typesMissingFrom2 = new();
+		Dictionary<TypeDefinition, TypeDefinition> type1ToType2 = new();
+		MatchTypes(module1, module2, typesMissingFrom1, typesMissingFrom2, type1ToType2);
+
+		List<MethodDefinition> methodsMissingFrom1 = new();
+		List<MethodDefinition> methodsMissingFrom2 = new();
+		Dictionary<MethodDefinition, MethodDefinition> method1ToMethod2 = new();
+		foreach ((TypeDefinition type1, TypeDefinition type2) in type1ToType2)
+		{
+			MatchNameAndSignature(type1.Methods, type2.Methods, methodsMissingFrom1, methodsMissingFrom2, method1ToMethod2, m => m.Signature!, SignatureComparer.Default);
+		}
+
+		List<(MethodDefinition, MethodDefinition)> differentMethods = new();
+		foreach ((MethodDefinition method1, MethodDefinition method2) in method1ToMethod2)
+		{
+			if (method1.CilMethodBody is null)
+			{
+				if (method2.CilMethodBody is not null)
+				{
+					differentMethods.Add((method1, method2));
+				}
+				continue;
+			}
+			else if (method2.CilMethodBody is null)
+			{
+				differentMethods.Add((method1, method2));
+				continue;
+			}
+
+			method1.CilMethodBody.Instructions.ExpandMacros();
+			method2.CilMethodBody.Instructions.ExpandMacros();
+			if (!CilInstructionCollectionEquality.Equals(method1.CilMethodBody, method2.CilMethodBody))
+			{
+				CilInstructionCollectionEquality.Equals(method1.CilMethodBody, method2.CilMethodBody);
+				differentMethods.Add((method1, method2));
+			}
+		}
+
+		List<FieldDefinition> fieldsMissingFrom1 = new();
+		List<FieldDefinition> fieldsMissingFrom2 = new();
+		Dictionary<FieldDefinition, FieldDefinition> field1ToField2 = new();
+		foreach ((TypeDefinition type1, TypeDefinition type2) in type1ToType2)
+		{
+			MatchName(type1.Fields, type2.Fields, fieldsMissingFrom1, fieldsMissingFrom2, field1ToField2);
+		}
+
+		List<(FieldDefinition, FieldDefinition)> differentFields = new();
+		foreach ((FieldDefinition field1, FieldDefinition field2) in field1ToField2)
+		{
+			if (!SignatureComparer.Default.Equals(field1.Signature, field2.Signature))
+			{
+				differentFields.Add((field1, field2));
+			}
+		}
+
+		List<PropertyDefinition> propertiesMissingFrom1 = new();
+		List<PropertyDefinition> propertiesMissingFrom2 = new();
+		Dictionary<PropertyDefinition, PropertyDefinition> property1ToProperty2 = new();
+		foreach ((TypeDefinition type1, TypeDefinition type2) in type1ToType2)
+		{
+			MatchNameAndSignature(type1.Properties, type2.Properties, propertiesMissingFrom1, propertiesMissingFrom2, property1ToProperty2, p => p.Signature!, SignatureComparer.Default);
+		}
+
+		List<EventDefinition> eventsMissingFrom1 = new();
+		List<EventDefinition> eventsMissingFrom2 = new();
+		Dictionary<EventDefinition, EventDefinition> event1ToEvent2 = new();
+		foreach ((TypeDefinition type1, TypeDefinition type2) in type1ToType2)
+		{
+			MatchName(type1.Events, type2.Events, eventsMissingFrom1, eventsMissingFrom2, event1ToEvent2);
+		}
+
+		List<(EventDefinition, EventDefinition)> differentEvents = new();
+		foreach ((EventDefinition event1, EventDefinition event2) in event1ToEvent2)
+		{
+			if (!SignatureComparer.Default.Equals(event1.EventType, event2.EventType))
+			{
+				differentEvents.Add((event1, event2));
+			}
+		}
+
+		Console.WriteLine($"Types missing from module 1: {typesMissingFrom1.Count}");
+		Console.WriteLine($"Types missing from module 2: {typesMissingFrom2.Count}");
+		Console.WriteLine($"Types matched: {type1ToType2.Count}");
+		Console.WriteLine();
+		Console.WriteLine($"Methods missing from module 1: {methodsMissingFrom1.Count}");
+		Console.WriteLine($"Methods missing from module 2: {methodsMissingFrom2.Count}");
+		Console.WriteLine($"Methods matched: {method1ToMethod2.Count}");
+		Console.WriteLine($"Different methods: {differentMethods.Count}");
+		Console.WriteLine();
+		Console.WriteLine($"Fields missing from module 1: {fieldsMissingFrom1.Count}");
+		Console.WriteLine($"Fields missing from module 2: {fieldsMissingFrom2.Count}");
+		Console.WriteLine($"Fields matched: {field1ToField2.Count}");
+		Console.WriteLine($"Different fields: {differentFields.Count}");
+		Console.WriteLine();
+		Console.WriteLine($"Properties missing from module 1: {propertiesMissingFrom1.Count}");
+		Console.WriteLine($"Properties missing from module 2: {propertiesMissingFrom2.Count}");
+		Console.WriteLine($"Properties matched: {property1ToProperty2.Count}");
+		Console.WriteLine();
+		Console.WriteLine($"Events missing from module 1: {eventsMissingFrom1.Count}");
+		Console.WriteLine($"Events missing from module 2: {eventsMissingFrom2.Count}");
+		Console.WriteLine($"Events matched: {event1ToEvent2.Count}");
+		Console.WriteLine($"Different events: {differentEvents.Count}");
+	}
+
+	private static void MatchName<T>(IList<T> list1, IList<T> list2, List<T> missingFrom1, List<T> missingFrom2, Dictionary<T, T> value1ToValue2)
+		where T : class, INameProvider
+	{
+		for (int i = 0; i < list2.Count; i++)
+		{
+			T value2 = list2[i];
+			if (i < list1.Count && list1[i].Name == value2.Name)
+			{
+				value1ToValue2.Add(list1[i], value2);
+				continue;
+			}
+
+			T? value1 = list1.FirstOrDefault(v => v.Name == value2.Name);
+			if (value1 is null)
+			{
+				missingFrom1.Add(value2);
+			}
+			else
+			{
+				value1ToValue2.Add(value1, value2);
+			}
+		}
+
+		foreach (T value1 in list1)
+		{
+			if (!value1ToValue2.ContainsKey(value1))
+			{
+				missingFrom2.Add(value1);
+			}
+		}
+	}
+
+	private static void MatchNameAndSignature<T, TSignature>(IList<T> list1, IList<T> list2, List<T> missingFrom1, List<T> missingFrom2, Dictionary<T, T> value1ToValue2, Func<T, TSignature> getSignature, IEqualityComparer<TSignature> signatureComparer)
+		where T : class, INameProvider
+	{
+		for (int i = 0; i < list2.Count; i++)
+		{
+			T value2 = list2[i];
+			if (i < list1.Count && list1[i].Name == value2.Name && SignatureEquals(list1[i], value2, getSignature, signatureComparer))
+			{
+				value1ToValue2.Add(list1[i], value2);
+				continue;
+			}
+
+			T? value1 = list1.FirstOrDefault(v => v.Name == value2.Name && SignatureEquals(v, value2, getSignature, signatureComparer));
+			if (value1 is null)
+			{
+				missingFrom1.Add(value2);
+			}
+			else
+			{
+				value1ToValue2.Add(value1, value2);
+			}
+		}
+
+		foreach (T value1 in list1)
+		{
+			if (!value1ToValue2.ContainsKey(value1))
+			{
+				missingFrom2.Add(value1);
+			}
+		}
+
+		static bool SignatureEquals(T value1, T value2, Func<T, TSignature> getSignature, IEqualityComparer<TSignature> signatureComparer)
+		{
+			return signatureComparer.Equals(getSignature(value1), getSignature(value2));
+		}
+	}
+
+	private static void MatchTypes(ModuleDefinition module1, ModuleDefinition module2, List<TypeDefinition> typesMissingFrom1, List<TypeDefinition> typesMissingFrom2, Dictionary<TypeDefinition, TypeDefinition> type1ToType2)
+	{
+		foreach (TypeDefinition type2 in module2.TopLevelTypes)
+		{
+			TypeDefinition? type1 = module1.TopLevelTypes.FirstOrDefault(t => SignatureComparer.Default.Equals(t, type2));
+			if (type1 is null)
+			{
+				typesMissingFrom1.Add(type2);
+			}
+			else
+			{
+				type1ToType2.Add(type1, type2);
+				MatchNestedTypes(type1, type2, typesMissingFrom1, typesMissingFrom2, type1ToType2);
+			}
+		}
+
+		foreach (TypeDefinition type1 in module1.TopLevelTypes)
+		{
+			if (!type1ToType2.ContainsKey(type1))
+			{
+				typesMissingFrom2.Add(type1);
+			}
+		}
+
+		static void MatchNestedTypes(TypeDefinition type1, TypeDefinition type2, List<TypeDefinition> typesMissingFrom1, List<TypeDefinition> typesMissingFrom2, Dictionary<TypeDefinition, TypeDefinition> type1ToType2)
+		{
+			foreach (TypeDefinition nestedType2 in type2.NestedTypes)
+			{
+				TypeDefinition? nestedType1 = type1.NestedTypes.FirstOrDefault(t => t.Name == nestedType2.Name);
+				if (nestedType1 is null)
+				{
+					typesMissingFrom1.Add(nestedType2);
+				}
+				else
+				{
+					type1ToType2.Add(nestedType1, nestedType2);
+					MatchNestedTypes(nestedType1, nestedType2, typesMissingFrom1, typesMissingFrom2, type1ToType2);
+				}
+			}
+
+			foreach (TypeDefinition nestedType1 in type1.NestedTypes)
+			{
+				if (!type1ToType2.ContainsKey(nestedType1))
+				{
+					typesMissingFrom2.Add(nestedType1);
+				}
+			}
+		}
+	}
+}
@@ -1,34 +1,58 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34321.82
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.CIL", "AssetRipper.CIL\AssetRipper.CIL.csproj", "{3F385513-F04F-4282-9B91-2693CA93ED1C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88415A5B-37C1-4CDF-93E0-2682460B6390}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		Directory.Build.props = Directory.Build.props
-		LICENSE = LICENSE
-		README.md = README.md
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FEAD0DEB-0A49-4BC9-A468-3D1E9D52EF2C}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34321.82
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.CIL", "AssetRipper.CIL\AssetRipper.CIL.csproj", "{3F385513-F04F-4282-9B91-2693CA93ED1C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88415A5B-37C1-4CDF-93E0-2682460B6390}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
+		Directory.Build.props = Directory.Build.props
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.CIL.Validator", "AssetRipper.CIL.Validator\AssetRipper.CIL.Validator.csproj", "{0E177F49-031D-486A-ADD2-6823263D1923}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.CIL.Standardizer", "AssetRipper.CIL.Standardizer\AssetRipper.CIL.Standardizer.csproj", "{9E6D8580-5C3C-4AA8-89C9-34F475B79B24}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.CIL.Stubber", "AssetRipper.CIL.Stubber\AssetRipper.CIL.Stubber.csproj", "{A35A3452-2211-4DF5-A5A5-406FDF1E1A76}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.CIL.Tests", "AssetRipper.CIL.Tests\AssetRipper.CIL.Tests.csproj", "{FC03589F-7457-45E7-9628-F9E003F30BAB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F385513-F04F-4282-9B91-2693CA93ED1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E177F49-031D-486A-ADD2-6823263D1923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E177F49-031D-486A-ADD2-6823263D1923}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E177F49-031D-486A-ADD2-6823263D1923}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E177F49-031D-486A-ADD2-6823263D1923}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E6D8580-5C3C-4AA8-89C9-34F475B79B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E6D8580-5C3C-4AA8-89C9-34F475B79B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E6D8580-5C3C-4AA8-89C9-34F475B79B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E6D8580-5C3C-4AA8-89C9-34F475B79B24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A35A3452-2211-4DF5-A5A5-406FDF1E1A76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A35A3452-2211-4DF5-A5A5-406FDF1E1A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A35A3452-2211-4DF5-A5A5-406FDF1E1A76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A35A3452-2211-4DF5-A5A5-406FDF1E1A76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC03589F-7457-45E7-9628-F9E003F30BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC03589F-7457-45E7-9628-F9E003F30BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC03589F-7457-45E7-9628-F9E003F30BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC03589F-7457-45E7-9628-F9E003F30BAB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FEAD0DEB-0A49-4BC9-A468-3D1E9D52EF2C}
+	EndGlobalSection
+EndGlobal
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>

 		<PackageId>AssetRipper.CIL</PackageId>
@@ -15,12 +15,12 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="AsmResolver.DotNet" Version="5.5.0" />
-		<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+		<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.1" />
+		<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
 	</ItemGroup>

 	<ItemGroup>
-		<None Include="../README.md" Pack="true" PackagePath="/"/>
+		<None Include="../README.md" Pack="true" PackagePath="/" />
 	</ItemGroup>

 </Project>
@@ -1,13 +1,13 @@
 using AsmResolver.DotNet.Code.Cil;
-using AsmResolver.DotNet.Signatures.Types;
+using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
-using AsmResolver.PE.DotNet.Metadata.Tables.Rows;
+using AsmResolver.PE.DotNet.Metadata.Tables;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;

 namespace AssetRipper.CIL;

-internal static class CilInstructionCollectionExtensions
+public static class CilInstructionCollectionExtensions
 {
 	public static CilLocalVariable AddLocalVariable(this CilInstructionCollection instructions, TypeSignature variableType)
 	{
@@ -16,7 +16,7 @@ internal static class CilInstructionCollectionExtensions
 		return variable;
 	}

-	public static void AddDefaultValueForType(this CilInstructionCollection instructions, TypeSignature type)
+	public static void AddDefaultValue(this CilInstructionCollection instructions, TypeSignature type)
 	{
 		if (type is CorLibTypeSignature { IsValueType: true } corLibTypeSignature)
 		{
@@ -36,6 +36,173 @@ internal static class CilInstructionCollectionExtensions
 		}
 	}

+	public static void InitializeDefaultValue(this CilInstructionCollection instructions, CilLocalVariable localVariable)
+	{
+		TypeSignature type = localVariable.VariableType;
+		if (type is CorLibTypeSignature { IsValueType: true } corLibTypeSignature)
+		{
+			instructions.InitializeDefaultPrimitiveValue(corLibTypeSignature, localVariable);
+		}
+		else if (type is ByReferenceTypeSignature)
+		{
+			instructions.AddNullRef();
+			instructions.Add(CilOpCodes.Stloc, localVariable);
+		}
+		else if (type.IsValueTypeOrGenericParameter())
+		{
+			instructions.InitializeDefaultValueForUnknownType(localVariable);
+		}
+		else
+		{
+			instructions.Add(CilOpCodes.Ldnull);
+			instructions.Add(CilOpCodes.Stloc, localVariable);
+		}
+	}
+
+	/// <summary>
+	/// Remove the last instruction in the collection
+	/// </summary>
+	/// <param name="instructions">The collection to remove the instruction from</param>
+	public static void Pop(this CilInstructionCollection instructions) => instructions.RemoveAt(instructions.Count - 1);
+
+	public static void AddBooleanNot(this CilInstructionCollection instructions)
+	{
+		instructions.Add(CilOpCodes.Ldc_I4_0);
+		instructions.Add(CilOpCodes.Ceq);
+	}
+
+	public static CilInstruction AddLoadElement(this CilInstructionCollection instructions, TypeSignature elementType)
+	{
+		return elementType switch
+		{
+			CorLibTypeSignature corLibTypeSignature => corLibTypeSignature.ElementType switch
+			{
+				ElementType.Boolean => instructions.Add(CilOpCodes.Ldelem_U1),
+				ElementType.I1 => instructions.Add(CilOpCodes.Ldelem_I1),
+				ElementType.U1 => instructions.Add(CilOpCodes.Ldelem_U1),
+				ElementType.I2 => instructions.Add(CilOpCodes.Ldelem_I2),
+				ElementType.U2 => instructions.Add(CilOpCodes.Ldelem_U2),
+				ElementType.I4 => instructions.Add(CilOpCodes.Ldelem_I4),
+				ElementType.U4 => instructions.Add(CilOpCodes.Ldelem_U4),
+				ElementType.I8 => instructions.Add(CilOpCodes.Ldelem_I8),
+				ElementType.U8 => instructions.Add(CilOpCodes.Ldelem_I8),
+				ElementType.R4 => instructions.Add(CilOpCodes.Ldelem_R4),
+				ElementType.R8 => instructions.Add(CilOpCodes.Ldelem_R8),
+				_ => elementType.IsValueType ? instructions.Add(CilOpCodes.Ldelem) : instructions.Add(CilOpCodes.Ldelem_Ref)
+			},
+			GenericParameterSignature => instructions.Add(CilOpCodes.Ldelem),
+			_ => elementType.IsValueType ? instructions.Add(CilOpCodes.Ldelem) : instructions.Add(CilOpCodes.Ldelem_Ref)
+		};
+	}
+
+	public static CilInstruction AddStoreElement(this CilInstructionCollection instructions, TypeSignature elementType)
+	{
+		return elementType switch
+		{
+			CorLibTypeSignature corLibTypeSignature => corLibTypeSignature.ElementType switch
+			{
+				ElementType.Boolean => instructions.Add(CilOpCodes.Stelem_I1),
+				ElementType.I1 => instructions.Add(CilOpCodes.Stelem_I1),
+				ElementType.U1 => instructions.Add(CilOpCodes.Stelem_I1),
+				ElementType.I2 => instructions.Add(CilOpCodes.Stelem_I2),
+				ElementType.U2 => instructions.Add(CilOpCodes.Stelem_I2),
+				ElementType.I4 => instructions.Add(CilOpCodes.Stelem_I4),
+				ElementType.U4 => instructions.Add(CilOpCodes.Stelem_I4),
+				ElementType.I8 => instructions.Add(CilOpCodes.Stelem_I8),
+				ElementType.U8 => instructions.Add(CilOpCodes.Stelem_I8),
+				ElementType.R4 => instructions.Add(CilOpCodes.Stelem_R4),
+				ElementType.R8 => instructions.Add(CilOpCodes.Stelem_R8),
+				_ => instructions.Add(CilOpCodes.Stelem_Ref),
+			},
+			GenericParameterSignature => instructions.Add(CilOpCodes.Stelem),
+			_ => elementType.IsValueType ? instructions.Add(CilOpCodes.Stelem) : instructions.Add(CilOpCodes.Stelem_Ref)
+		};
+	}
+
+	public static CilInstruction AddLoadIndirect(this CilInstructionCollection instructions, TypeSignature type)
+	{
+		return type switch
+		{
+			CorLibTypeSignature corLibTypeSignature => corLibTypeSignature.ElementType switch
+			{
+				ElementType.I1 => instructions.Add(CilOpCodes.Ldind_I1),
+				ElementType.I2 => instructions.Add(CilOpCodes.Ldind_I2),
+				ElementType.I4 => instructions.Add(CilOpCodes.Ldind_I4),
+				ElementType.I8 or ElementType.U8 => instructions.Add(CilOpCodes.Ldind_I8),
+				ElementType.U1 or ElementType.Boolean => instructions.Add(CilOpCodes.Ldind_U1),
+				ElementType.U2 or ElementType.Char => instructions.Add(CilOpCodes.Ldind_U2),
+				ElementType.U4 => instructions.Add(CilOpCodes.Ldind_U4),
+				ElementType.R4 => instructions.Add(CilOpCodes.Ldind_R4),
+				ElementType.R8 => instructions.Add(CilOpCodes.Ldind_R8),
+				ElementType.I or ElementType.U => instructions.Add(CilOpCodes.Ldind_I),
+				ElementType.Object or ElementType.String => instructions.Add(CilOpCodes.Ldind_Ref),
+				_ => instructions.Add(CilOpCodes.Ldobj, type.ToTypeDefOrRef()),
+			},
+			PointerTypeSignature => instructions.Add(CilOpCodes.Ldind_I),
+			GenericParameterSignature => instructions.Add(CilOpCodes.Ldobj, type.ToTypeDefOrRef()),
+			TypeDefOrRefSignature t => AddTypeDefOrRef(instructions, t),
+			_ => AddUnknown(instructions, type),
+		};
+
+		static CilInstruction AddUnknown(CilInstructionCollection instructions, TypeSignature type)
+		{
+			return type.IsValueType
+				? instructions.Add(CilOpCodes.Ldobj, type.ToTypeDefOrRef())
+				: instructions.Add(CilOpCodes.Ldind_Ref);
+		}
+
+		static CilInstruction AddTypeDefOrRef(CilInstructionCollection instructions, TypeDefOrRefSignature type)
+		{
+			// Check if the type is an enum
+			TypeSignature underlyingType = type.GetUnderlyingType();
+			return underlyingType is CorLibTypeSignature
+				? instructions.AddLoadIndirect(underlyingType)
+				: AddUnknown(instructions, underlyingType);
+		}
+	}
+
+	public static CilInstruction AddStoreIndirect(this CilInstructionCollection instructions, TypeSignature type)
+	{
+		return type switch
+		{
+			CorLibTypeSignature corLibTypeSignature => corLibTypeSignature.ElementType switch
+			{
+				ElementType.I1 => instructions.Add(CilOpCodes.Stind_I1),
+				ElementType.I2 => instructions.Add(CilOpCodes.Stind_I2),
+				ElementType.I4 => instructions.Add(CilOpCodes.Stind_I4),
+				ElementType.I8 or ElementType.U8 => instructions.Add(CilOpCodes.Stind_I8),
+				ElementType.U1 or ElementType.Boolean => instructions.Add(CilOpCodes.Stind_I1),
+				ElementType.U2 or ElementType.Char => instructions.Add(CilOpCodes.Stind_I2),
+				ElementType.U4 => instructions.Add(CilOpCodes.Stind_I4),
+				ElementType.R4 => instructions.Add(CilOpCodes.Stind_R4),
+				ElementType.R8 => instructions.Add(CilOpCodes.Stind_R8),
+				ElementType.I or ElementType.U => instructions.Add(CilOpCodes.Stind_I),
+				ElementType.Object or ElementType.String => instructions.Add(CilOpCodes.Stind_Ref),
+				_ => instructions.Add(CilOpCodes.Stobj, type.ToTypeDefOrRef()),
+			},
+			PointerTypeSignature => instructions.Add(CilOpCodes.Stind_I),
+			GenericParameterSignature => instructions.Add(CilOpCodes.Stobj, type.ToTypeDefOrRef()),
+			TypeDefOrRefSignature t => AddTypeDefOrRef(instructions, t),
+			_ => AddUnknown(instructions, type),
+		};
+
+		static CilInstruction AddUnknown(CilInstructionCollection instructions, TypeSignature type)
+		{
+			return type.IsValueType
+				? instructions.Add(CilOpCodes.Stobj, type.ToTypeDefOrRef())
+				: instructions.Add(CilOpCodes.Stind_Ref);
+		}
+
+		static CilInstruction AddTypeDefOrRef(CilInstructionCollection instructions, TypeDefOrRefSignature type)
+		{
+			// Check if the type is an enum
+			TypeSignature underlyingType = type.GetUnderlyingType();
+			return underlyingType is CorLibTypeSignature
+				? instructions.AddStoreIndirect(underlyingType)
+				: AddUnknown(instructions, underlyingType);
+		}
+	}
+
 	/// <summary>
 	/// Load a null reference onto the stack.
 	/// </summary>
@@ -46,7 +213,7 @@ internal static class CilInstructionCollectionExtensions
 	/// However, it does produce a compiler warning.
 	/// </remarks>
 	/// <param name="instructions"></param>
-	private static void AddNullRef(this CilInstructionCollection instructions)
+	public static void AddNullRef(this CilInstructionCollection instructions)
 	{
 		instructions.Add(CilOpCodes.Ldc_I4_0);
 		instructions.Add(CilOpCodes.Conv_U);
@@ -62,13 +229,19 @@ internal static class CilInstructionCollectionExtensions
 	/// <param name="type"></param>
 	private static void AddDefaultValueForUnknownType(this CilInstructionCollection instructions, TypeSignature type)
 	{
-		Debug.Assert(type is not CorLibTypeSignature { ElementType: ElementType.Void } and not ByReferenceTypeSignature);
 		CilLocalVariable variable = instructions.AddLocalVariable(type);
-		instructions.Add(CilOpCodes.Ldloca, variable);
-		instructions.Add(CilOpCodes.Initobj, type.ToTypeDefOrRef());
+		InitializeDefaultValueForUnknownType(instructions, variable);
 		instructions.Add(CilOpCodes.Ldloc, variable);
 	}

+	private static void InitializeDefaultValueForUnknownType(this CilInstructionCollection instructions, CilLocalVariable localVariable)
+	{
+		TypeSignature type = localVariable.VariableType;
+		Debug.Assert(type is not CorLibTypeSignature { ElementType: ElementType.Void } and not ByReferenceTypeSignature);
+		instructions.Add(CilOpCodes.Ldloca, localVariable);
+		instructions.Add(CilOpCodes.Initobj, type.ToTypeDefOrRef());
+	}
+
 	private static void AddDefaultPrimitiveValue(this CilInstructionCollection instructions, CorLibTypeSignature type)
 	{
 		switch (type.ElementType)
@@ -104,10 +277,58 @@ internal static class CilInstructionCollectionExtensions
 				instructions.Add(CilOpCodes.Ldnull);
 				break;
 			case ElementType.TypedByRef:
+			default:
 				instructions.AddDefaultValueForUnknownType(type);
 				break;
+		}
+	}
+
+	private static void InitializeDefaultPrimitiveValue(this CilInstructionCollection instructions, CorLibTypeSignature type, CilLocalVariable localVariable)
+	{
+		switch (type.ElementType)
+		{
+			case ElementType.Void:
+				break;
+			case ElementType.U1 or ElementType.U2 or ElementType.U4 or ElementType.I1 or ElementType.I2 or ElementType.I4 or ElementType.Boolean or ElementType.Char:
+				instructions.Add(CilOpCodes.Ldc_I4_0);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.I8:
+				instructions.Add(CilOpCodes.Ldc_I4_0);
+				instructions.Add(CilOpCodes.Conv_I8);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.U8:
+				instructions.Add(CilOpCodes.Ldc_I4_0);
+				instructions.Add(CilOpCodes.Conv_U8);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.I:
+				instructions.Add(CilOpCodes.Ldc_I4_0);
+				instructions.Add(CilOpCodes.Conv_I);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.U:
+				instructions.Add(CilOpCodes.Ldc_I4_0);
+				instructions.Add(CilOpCodes.Conv_U);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.R4:
+				instructions.Add(CilOpCodes.Ldc_R4, 0f);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.R8:
+				instructions.Add(CilOpCodes.Ldc_R8, 0d);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.Object or ElementType.String:
+				instructions.Add(CilOpCodes.Ldnull);
+				instructions.Add(CilOpCodes.Stloc, localVariable);
+				break;
+			case ElementType.TypedByRef:
 			default:
-				throw new ArgumentOutOfRangeException(null);
+				instructions.InitializeDefaultValueForUnknownType(localVariable);
+				break;
 		}
 	}
 }
@@ -0,0 +1,53 @@
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL;
+
+public static class CilInstructionExtensions
+{
+	public static bool IsLdcI4OrI8(this CilInstruction instruction, out long value)
+	{
+		if (instruction.IsLdcI4())
+		{
+			value = instruction.GetLdcI4Constant();
+			return true;
+		}
+		else if (instruction.OpCode == CilOpCodes.Ldc_I8 && instruction.Operand is long i64)
+		{
+			value = i64;
+			return true;
+		}
+		else
+		{
+			value = default;
+			return false;
+		}
+	}
+
+	public static bool IsLdcI4(this CilInstruction instruction, out int value)
+	{
+		if (instruction.IsLdcI4())
+		{
+			value = instruction.GetLdcI4Constant();
+			return true;
+		}
+		else
+		{
+			value = default;
+			return false;
+		}
+	}
+
+	public static bool IsLdcI8(this CilInstruction instruction, out long value)
+	{
+		if (instruction.OpCode == CilOpCodes.Ldc_I8 && instruction.Operand is long i64)
+		{
+			value = i64;
+			return true;
+		}
+		else
+		{
+			value = default;
+			return false;
+		}
+	}
+}
@@ -0,0 +1,54 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Signatures;
+using System.Diagnostics.CodeAnalysis;
+
+namespace AssetRipper.CIL;
+
+public static class EventDefinitionExtensions
+{
+	public static bool IsInstance(this EventDefinition eventDefinition)
+	{
+		return (eventDefinition.AddMethod?.IsInstance() ?? false)
+			|| (eventDefinition.RemoveMethod?.IsInstance() ?? false);
+	}
+
+	public static bool IsStatic(this EventDefinition eventDefinition)
+	{
+		return (eventDefinition.AddMethod?.IsStatic ?? false)
+			|| (eventDefinition.RemoveMethod?.IsStatic ?? false);
+	}
+
+	public static bool HasAddMethod(this EventDefinition eventDefinition)
+	{
+		return eventDefinition.AddMethod is not null;
+	}
+
+	public static bool HasRemoveMethod(this EventDefinition eventDefinition)
+	{
+		return eventDefinition.RemoveMethod is not null;
+	}
+
+	public static bool HasFireMethod(this EventDefinition eventDefinition)
+	{
+		return eventDefinition.FireMethod is not null;
+	}
+
+	public static bool HasBackingField(this EventDefinition eventDefinition, [NotNullWhen(true)] out FieldDefinition? backingField)
+	{
+		TypeSignature? eventType = eventDefinition.EventType?.ToTypeSignature();
+		if (eventType is not null)
+		{
+			foreach (FieldDefinition field in eventDefinition.DeclaringType?.Fields ?? [])
+			{
+				if (field.IsPrivate && field.Name == eventDefinition.Name && SignatureComparer.Default.Equals(field.Signature?.FieldType, eventType))
+				{
+					backingField = field;
+					return true;
+				}
+			}
+		}
+
+		backingField = null;
+		return false;
+	}
+}
@@ -0,0 +1,60 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Signatures;
+using System.Diagnostics.CodeAnalysis;
+
+namespace AssetRipper.CIL;
+
+public static class FieldDefinitionExtensions
+{
+	public static bool IsInstance(this FieldDefinition field)
+	{
+		return !field.IsStatic;
+	}
+
+	private static bool IsPropertyBackingField(this FieldDefinition field, [NotNullWhen(true)] out string? propertyName)
+	{
+		string? name = field.Name;
+		if (name is ['<', ..] && name.EndsWith(">k__BackingField", StringComparison.Ordinal))
+		{
+			propertyName = name[1..^16];
+			return true;
+		}
+		else
+		{
+			propertyName = null;
+			return false;
+		}
+	}
+
+	public static bool IsPropertyBackingField(this FieldDefinition field, [NotNullWhen(true)] out PropertyDefinition? property)
+	{
+		if (field.IsPropertyBackingField(out string? propertyName))
+		{
+			property = field.DeclaringType?.Properties.FirstOrDefault(p => p.Name == propertyName);
+			return property is not null
+				&& field.IsStatic == property.IsStatic()
+				&& SignatureComparer.Default.Equals(field.Signature?.FieldType, property.Signature?.ReturnType);
+		}
+		else
+		{
+			property = null;
+			return false;
+		}
+	}
+
+	public static bool IsEventBackingField(this FieldDefinition field, [NotNullWhen(true)] out EventDefinition? @event)
+	{
+		if (field.IsPrivate)
+		{
+			@event = field.DeclaringType?.Events.FirstOrDefault(e => e.Name == field.Name);
+			return @event is not null
+				&& field.IsStatic == @event.IsStatic()
+				&& SignatureComparer.Default.Equals(@event.EventType?.ToTypeSignature(), field.Signature?.FieldType);
+		}
+		else
+		{
+			@event = null;
+			return false;
+		}
+	}
+}
@@ -0,0 +1,20 @@
+using AsmResolver.DotNet.Code.Cil;
+using AssetRipper.CIL.Manipulation;
+
+namespace AssetRipper.CIL;
+
+public static class MacroStandardization
+{
+	/// <summary>
+	/// This method expands all macros in the collection and applies some standardizations, such as removing nop and switch instructions.
+	/// </summary>
+	/// <param name="instructions">The collection to modify.</param>
+	public static void StandardizeMacros(this CilInstructionCollection instructions)
+	{
+		new CilManipulationContext(instructions)
+			.Execute<MacroExpander>()
+			.Execute<NopRemover>()
+			.Execute<SwitchRemover>()
+			.Execute<RedundantConversionRemover>();
+	}
+}
@@ -0,0 +1,105 @@
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Manipulation;
+
+public sealed class CilManipulationContext
+{
+	private readonly Dictionary<CilInstruction, HashSet<CilInstructionLabel>> instructionReferences = new();
+	public CilInstructionCollection Instructions { get; }
+
+	public CilManipulationContext(CilInstructionCollection instructions)
+	{
+		Instructions = instructions;
+
+		foreach (CilExceptionHandler handler in instructions.Owner.ExceptionHandlers)
+		{
+			AddReference(handler.TryStart as CilInstructionLabel);
+			AddReference(handler.TryEnd as CilInstructionLabel);
+			AddReference(handler.HandlerStart as CilInstructionLabel);
+			AddReference(handler.HandlerEnd as CilInstructionLabel);
+			AddReference(handler.FilterStart as CilInstructionLabel);
+		}
+
+		foreach (CilInstruction instruction in instructions)
+		{
+			if (instruction.Operand is CilInstructionLabel label)
+			{
+				AddReference(label);
+			}
+			else if (instruction.Operand is IReadOnlyList<ICilLabel> labels) // switch
+			{
+				foreach (ICilLabel l in labels)
+				{
+					AddReference(l as CilInstructionLabel);
+				}
+			}
+		}
+	}
+
+	public bool CanRemove(CilInstruction instruction) => !instructionReferences.ContainsKey(instruction);
+
+	public void Remove(CilInstruction instruction)
+	{
+		if (!CanRemove(instruction))
+		{
+			throw new InvalidOperationException("Cannot remove instruction with references");
+		}
+		Instructions.Remove(instruction);
+	}
+
+	public bool TryRemove(CilInstruction instruction)
+	{
+		return CanRemove(instruction) && Instructions.Remove(instruction);
+	}
+
+	public void Replace(CilInstruction oldInstruction, CilInstruction newInstruction)
+	{
+		if (instructionReferences.TryGetValue(oldInstruction, out HashSet<CilInstructionLabel>? references))
+		{
+			instructionReferences.Remove(oldInstruction);
+			instructionReferences.Add(newInstruction, references);
+			foreach (CilInstructionLabel label in references)
+			{
+				label.Instruction = newInstruction;
+			}
+		}
+		Instructions[Instructions.IndexOf(oldInstruction)] = newInstruction;
+	}
+
+	public void ReassignReferences(CilInstruction oldInstruction, CilInstruction newInstruction)
+	{
+		if (instructionReferences.TryGetValue(oldInstruction, out HashSet<CilInstructionLabel>? oldReferences))
+		{
+			instructionReferences.Remove(oldInstruction);
+			foreach (CilInstructionLabel label in oldReferences)
+			{
+				label.Instruction = newInstruction;
+			}
+
+			if (instructionReferences.TryGetValue(newInstruction, out HashSet<CilInstructionLabel>? newReferences))
+			{
+				newReferences.UnionWith(oldReferences);
+			}
+			else
+			{
+				instructionReferences.Add(newInstruction, oldReferences);
+			}
+		}
+	}
+
+	public CilManipulationContext Execute<T>() where T : ICilManipulator, new()
+	{
+		SingletonCache<T>.Instance.Execute(this);
+		return this;
+	}
+
+	private void AddReference(CilInstructionLabel? label)
+	{
+		CilInstruction? instruction = label?.Instruction;
+		if (instruction is not null)
+		{
+			instructionReferences.GetOrCreate(instruction).Add(label!);
+		}
+	}
+}
@@ -0,0 +1,16 @@
+namespace AssetRipper.CIL.Manipulation;
+
+internal static class DictionaryExtensions
+{
+	public static TValue GetOrCreate<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key)
+		where TKey : notnull
+		where TValue : new()
+	{
+		if (!dictionary.TryGetValue(key, out TValue? value))
+		{
+			value = new TValue();
+			dictionary[key] = value;
+		}
+		return value;
+	}
+}
@@ -0,0 +1,12 @@
+namespace AssetRipper.CIL.Manipulation;
+
+/// <summary>
+/// An interface for manipulating CIL instructions.
+/// </summary>
+/// <remarks>
+/// Derived classes are expected to be stateless and have a parameterless constructor.
+/// </remarks>
+public interface ICilManipulator
+{
+	void Execute(CilManipulationContext context);
+}
@@ -0,0 +1,6 @@
+namespace AssetRipper.CIL.Manipulation;
+
+public sealed class MacroExpander : ICilManipulator
+{
+	public void Execute(CilManipulationContext context) => context.Instructions.ExpandMacros();
+}
@@ -0,0 +1,6 @@
+namespace AssetRipper.CIL.Manipulation;
+
+public sealed class MacroOptimizer : ICilManipulator
+{
+	public void Execute(CilManipulationContext context) => context.Instructions.OptimizeMacros();
+}
@@ -0,0 +1,31 @@
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Manipulation;
+
+/// <summary>
+/// This removes all nop instructions.
+/// </summary>
+/// <remarks>
+/// This is a stronger version of <see cref="UnreferencedNopRemover"/>.
+/// </remarks>
+public sealed class NopRemover : ICilManipulator
+{
+	public void Execute(CilManipulationContext context)
+	{
+		int i = 1;
+		while (i < context.Instructions.Count)
+		{
+			CilInstruction previousInstruction = context.Instructions[i - 1];
+			if (previousInstruction.OpCode == CilOpCodes.Nop)
+			{
+				CilInstruction currentInstruction = context.Instructions[i];
+				context.ReassignReferences(previousInstruction, currentInstruction);
+				context.Remove(previousInstruction);
+			}
+			else
+			{
+				i++;
+			}
+		}
+	}
+}
@@ -0,0 +1,29 @@
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Manipulation;
+
+public sealed class RedundantConversionRemover : ICilManipulator
+{
+	public void Execute(CilManipulationContext context)
+	{
+		int i = 1;
+		while (i < context.Instructions.Count)
+		{
+			CilInstruction previousInstruction = context.Instructions[i - 1];
+			CilInstruction instruction = context.Instructions[i];
+			if (previousInstruction.OpCode == instruction.OpCode
+				&& instruction.OpCode.Code
+					is CilCode.Conv_I1 or CilCode.Conv_I2 or CilCode.Conv_I4 or CilCode.Conv_I8
+					or CilCode.Conv_U1 or CilCode.Conv_U2 or CilCode.Conv_U4 or CilCode.Conv_U8
+					or CilCode.Conv_R4 or CilCode.Conv_R8
+					or CilCode.Conv_I or CilCode.Conv_U
+				&& (context.TryRemove(instruction) || context.TryRemove(previousInstruction)))
+			{
+			}
+			else
+			{
+				i++;
+			}
+		}
+	}
+}
@@ -0,0 +1,6 @@
+namespace AssetRipper.CIL.Manipulation;
+
+internal static class SingletonCache<T> where T : new()
+{
+	public static T Instance { get; } = new T();
+}
@@ -0,0 +1,44 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Manipulation;
+
+/// <summary>
+/// This manipulator removes switch instructions by converting them to a series of conditional branches.
+/// </summary>
+public sealed class SwitchRemover : ICilManipulator
+{
+	public void Execute(CilManipulationContext context)
+	{
+		ModuleDefinition? module = context.Instructions.Owner.Owner.Module;
+		if (module is null)
+		{
+			return;
+		}
+
+		for (int i = 0; i < context.Instructions.Count; i++)
+		{
+			CilInstruction instruction = context.Instructions[i];
+			if (instruction.OpCode == CilOpCodes.Switch && instruction.Operand is IReadOnlyList<ICilLabel> labels)
+			{
+				CilLocalVariable switchValue = context.Instructions.AddLocalVariable(module.CorLibTypeFactory.UInt32);
+
+				context.Replace(instruction, new CilInstruction(CilOpCodes.Conv_U4));
+
+				context.Instructions.Insert(i + 1, new CilInstruction(CilOpCodes.Stloc, switchValue));
+				i++; // No need to process the newly added instruction
+
+				for (int j = 0; j < labels.Count; j++)
+				{
+					ICilLabel label = labels[j];
+					context.Instructions.Insert(i + 1, new CilInstruction(CilOpCodes.Ldloc, switchValue));
+					context.Instructions.Insert(i + 2, new CilInstruction(CilOpCodes.Ldc_I4, j));
+					context.Instructions.Insert(i + 3, new CilInstruction(CilOpCodes.Ceq));
+					context.Instructions.Insert(i + 4, new CilInstruction(CilOpCodes.Brtrue, label));
+					i += 4; // No need to process the newly added instructions
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,25 @@
+using AsmResolver.PE.DotNet.Cil;
+
+namespace AssetRipper.CIL.Manipulation;
+
+/// <summary>
+/// This removes unreferenced nop instructions.
+/// </summary>
+public sealed class UnreferencedNopRemover : ICilManipulator
+{
+	public void Execute(CilManipulationContext context)
+	{
+		int i = 0;
+		while (i < context.Instructions.Count)
+		{
+			CilInstruction instruction = context.Instructions[i];
+			if (instruction.OpCode == CilOpCodes.Nop && context.TryRemove(instruction))
+			{
+			}
+			else
+			{
+				i++;
+			}
+		}
+	}
+}
@@ -1,21 +1,65 @@
 using AsmResolver.DotNet;
+using AsmResolver.DotNet.Collections;
 using AsmResolver.DotNet.Signatures;
-using AsmResolver.DotNet.Signatures.Types;
-using AsmResolver.PE.DotNet.Metadata.Tables.Rows;
+using AsmResolver.PE.DotNet.Metadata.Tables;
 using System.Diagnostics.CodeAnalysis;

 namespace AssetRipper.CIL;

-internal static class MethodDefinitionExtensions
+public static class MethodDefinitionExtensions
 {
-	public static bool IsInstanceConstructor(this MethodDefinition methodDefinition)
+	/// <summary>
+	/// Replaces the method body with a sensible minimal implementation.
+	/// If the method is for an auto-property, the method will be replaced with a simple getter or setter.
+	/// Otherwise, the method content will be filled with a valid default implementation that does not throw
+	/// and handles all required logic, such as setting out parameters.
+	/// </summary>
+	/// <remarks>
+	/// If the method is not managed or should not have a body, this method does nothing.
+	/// </remarks>
+	/// <param name="methodDefinition">The method to modify.</param>
+	public static void ReplaceMethodBodyWithMinimalImplementation(this MethodDefinition methodDefinition)
 	{
-		return methodDefinition.IsConstructor && !methodDefinition.IsStatic;
+		MethodStubber.FillMethodBodyWithStub(methodDefinition);
 	}

-	public static bool ShouldCallBaseConstructor(this MethodDefinition methodDefinition)
+	public static bool IsInstance(this MethodDefinition methodDefinition)
 	{
-		return methodDefinition.IsInstanceConstructor() && methodDefinition.DeclaringType?.IsValueType is not true;
+		return !methodDefinition.IsStatic;
+	}
+
+	public static bool IsInstanceConstructor(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.IsConstructor && methodDefinition.IsInstance();
+	}
+
+	public static bool IsStaticConstructor(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.IsConstructor && methodDefinition.IsStatic;
+	}
+
+	public static bool HasReturnType(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.Signature is not null
+			&& methodDefinition.Signature.ReturnType is not CorLibTypeSignature { ElementType: ElementType.Void };
+	}
+
+	internal static bool ShouldCallBaseConstructor(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.IsInstanceConstructor() && !methodDefinition.IsDeclaredByValueType();
+	}
+
+	/// <summary>
+	/// Is this method declared inside a struct?
+	/// </summary>
+	public static bool IsDeclaredByValueType(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.DeclaringType?.IsValueType is true;
+	}
+
+	internal static bool ShouldInitializeFields(this MethodDefinition methodDefinition)
+	{
+		return methodDefinition.IsInstanceConstructor() && methodDefinition.IsDeclaredByValueType();
 	}

 	public static bool IsManagedMethodWithBody(this MethodDefinition managedMethod)
@@ -43,8 +87,9 @@ internal static class MethodDefinitionExtensions
 		string backingFieldName = $"<{method.Name.Value[4..]}>k__BackingField";
 		FieldDefinition? field = method.DeclaringType.Fields.FirstOrDefault(f => f.Name == backingFieldName);
 		if (field is null
-			|| !SignatureComparer.Default.Equals(field.Signature?.FieldType, method.Signature?.ReturnType)
-			|| field.IsStatic != method.IsStatic)
+			|| !field.IsPrivate
+			|| field.IsStatic != method.IsStatic
+			|| !SignatureComparer.Default.Equals(field.Signature?.FieldType, method.Signature?.ReturnType))
 		{
 			backingField = null;
 			return false;
@@ -72,8 +117,9 @@ internal static class MethodDefinitionExtensions
 		string backingFieldName = $"<{method.Name.Value[4..]}>k__BackingField";
 		FieldDefinition? field = method.DeclaringType.Fields.FirstOrDefault(f => f.Name == backingFieldName);
 		if (field is null
-			|| !SignatureComparer.Default.Equals(field.Signature?.FieldType, method.Parameters[0].ParameterType)
-			|| field.IsStatic != method.IsStatic)
+			|| !field.IsPrivate
+			|| field.IsStatic != method.IsStatic
+			|| !SignatureComparer.Default.Equals(field.Signature?.FieldType, method.Parameters[0].ParameterType))
 		{
 			backingField = null;
 			return false;
@@ -84,4 +130,26 @@ internal static class MethodDefinitionExtensions
 			return true;
 		}
 	}
+
+	public static Parameter AddParameter(this MethodDefinition method, TypeSignature parameterSignature, string parameterName)
+	{
+		return method.AddParameter(parameterSignature, parameterName, out _);
+	}
+
+	public static Parameter AddParameter(this MethodDefinition method, TypeSignature parameterSignature, string parameterName, out ParameterDefinition parameterDefinition)
+	{
+		parameterDefinition = new ParameterDefinition((ushort)(method.Signature!.ParameterTypes.Count + 1), parameterName, default);
+		method.Signature.ParameterTypes.Add(parameterSignature);
+		method.ParameterDefinitions.Add(parameterDefinition);
+
+		method.Parameters.PullUpdatesFromMethodSignature();
+		return method.Parameters.Single(parameter => parameter.Name == parameterName && parameter.ParameterType == parameterSignature);
+	}
+
+	public static Parameter AddParameter(this MethodDefinition method, TypeSignature parameterSignature)
+	{
+		method.Signature!.ParameterTypes.Add(parameterSignature);
+		method.Parameters.PullUpdatesFromMethodSignature();
+		return method.Parameters[^1];
+	}
 }
@@ -2,15 +2,14 @@
 using AsmResolver.DotNet.Code.Cil;
 using AsmResolver.DotNet.Collections;
 using AsmResolver.DotNet.Signatures;
-using AsmResolver.DotNet.Signatures.Types;
 using AsmResolver.PE.DotNet.Cil;
 using System.Diagnostics.CodeAnalysis;

 namespace AssetRipper.CIL;

-public static class MethodStubber
+internal static class MethodStubber
 {
-	public static void FillMethodBodyWithStub(this MethodDefinition methodDefinition)
+	public static void FillMethodBodyWithStub(MethodDefinition methodDefinition)
 	{
 		if (!methodDefinition.IsManagedMethodWithBody())
 		{
@@ -24,12 +23,12 @@ public static class MethodStubber
 		{
 			if (methodDefinition.IsStatic)
 			{
-				methodInstructions.Add(CilOpCodes.Ldsfld, backingField);
+				methodInstructions.Add(CilOpCodes.Ldsfld, backingField.MakeGenericIfNecessary());
 			}
 			else
 			{
 				methodInstructions.Add(CilOpCodes.Ldarg_0);
-				methodInstructions.Add(CilOpCodes.Ldfld, backingField);
+				methodInstructions.Add(CilOpCodes.Ldfld, backingField.MakeGenericIfNecessary());
 			}
 			methodInstructions.Add(CilOpCodes.Ret);
 			return;
@@ -39,18 +38,34 @@ public static class MethodStubber
 			if (methodDefinition.IsStatic)
 			{
 				methodInstructions.Add(CilOpCodes.Ldarg_0);
-				methodInstructions.Add(CilOpCodes.Stsfld, backingField);
+				methodInstructions.Add(CilOpCodes.Stsfld, backingField.MakeGenericIfNecessary());
 			}
 			else
 			{
 				methodInstructions.Add(CilOpCodes.Ldarg_0);
 				methodInstructions.Add(CilOpCodes.Ldarg_1);
-				methodInstructions.Add(CilOpCodes.Stfld, backingField);
+				methodInstructions.Add(CilOpCodes.Stfld, backingField.MakeGenericIfNecessary());
 			}
 			methodInstructions.Add(CilOpCodes.Ret);
 			return;
 		}

+		if (methodDefinition.ShouldInitializeFields())
+		{
+			TypeDefinition declaringType = methodDefinition.DeclaringType!;
+			foreach (FieldDefinition field in declaringType.Fields)
+			{
+				if (field.IsStatic || field.Signature is null)
+				{
+					continue;
+				}
+
+				methodInstructions.Add(CilOpCodes.Ldarg_0);
+				methodInstructions.AddDefaultValue(field.Signature.FieldType);
+				methodInstructions.Add(CilOpCodes.Stfld, field.MakeGenericIfNecessary());
+			}
+		}
+
 		if (methodDefinition.ShouldCallBaseConstructor() && TryGetBaseConstructor(methodDefinition, out IMethodDescriptor? baseConstructor))
 		{
 			MethodSignature? methodSignature = baseConstructor.Signature;
@@ -59,7 +74,7 @@ public static class MethodStubber
 				methodInstructions.Add(CilOpCodes.Ldarg_0);
 				foreach (TypeSignature baseParameterType in methodSignature.ParameterTypes)
 				{
-					methodInstructions.AddDefaultValueForType(baseParameterType);
+					methodInstructions.AddDefaultValue(baseParameterType);
 				}
 				methodInstructions.Add(CilOpCodes.Call, baseConstructor);
 			}
@@ -87,7 +102,7 @@ public static class MethodStubber
 				}
 			}
 		}
-		methodInstructions.AddDefaultValueForType(methodDefinition.Signature!.ReturnType);
+		methodInstructions.AddDefaultValue(methodDefinition.Signature!.ReturnType);
 		methodInstructions.Add(CilOpCodes.Ret);
 		methodInstructions.OptimizeMacros();
 	}
@@ -166,4 +181,18 @@ public static class MethodStubber
 		baseConstructor = TryGetBaseConstructor(methodDefinition);
 		return baseConstructor is not null;
 	}
+
+	private static IFieldDescriptor MakeGenericIfNecessary(this FieldDefinition field)
+	{
+		if (field.DeclaringType is null or { GenericParameters.Count: 0 })
+		{
+			return field;
+		}
+
+		TypeSignature[] typeArguments = Enumerable.Range(0, field.DeclaringType.GenericParameters.Count)
+			.Select(i => new GenericParameterSignature(field.Module, GenericParameterType.Type, i))
+			.ToArray();
+
+		return new MemberReference(field.DeclaringType.MakeGenericInstanceType(typeArguments).ToTypeDefOrRef(), field.Name, field.Signature);
+	}
 }
@@ -1,5 +1,5 @@
 using AsmResolver.DotNet.Collections;
-using AsmResolver.DotNet.Signatures.Types;
+using AsmResolver.DotNet.Signatures;
 using System.Diagnostics.CodeAnalysis;

 namespace AssetRipper.CIL;
@@ -0,0 +1,45 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Signatures;
+using System.Diagnostics.CodeAnalysis;
+
+namespace AssetRipper.CIL;
+
+public static class PropertyDefinitionExtensions
+{
+	public static bool HasBackingField(this PropertyDefinition property, [NotNullWhen(true)] out FieldDefinition? backingField)
+	{
+		string backingFieldName = $"<{property.Name}>k__BackingField";
+		backingField = property.DeclaringType?.Fields.FirstOrDefault(f => f.Name == backingFieldName);
+		if (backingField is null
+			|| !backingField.IsPrivate
+			|| backingField.IsStatic != property.IsStatic()
+			|| !SignatureComparer.Default.Equals(backingField.Signature?.FieldType, property.Signature?.ReturnType))
+		{
+			backingField = null;
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public static bool HasGetMethod(this PropertyDefinition property)
+	{
+		return property.GetMethod is not null;
+	}
+
+	public static bool HasSetMethod(this PropertyDefinition property)
+	{
+		return property.SetMethod is not null;
+	}
+
+	public static bool HasBothAccessors(this PropertyDefinition property)
+	{
+		return property.HasGetMethod() && property.HasSetMethod();
+	}
+
+	public static bool IsInstance(this PropertyDefinition property) => property.Signature?.HasThis ?? false;
+
+	public static bool IsStatic(this PropertyDefinition property) => !property.Signature?.HasThis ?? false;
+}
@@ -0,0 +1,34 @@
+using AsmResolver.DotNet;
+using AsmResolver.DotNet.Code.Cil;
+using AsmResolver.DotNet.Signatures;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+
+namespace AssetRipper.CIL;
+
+public static class TypeDefinitionExtensions
+{
+	public static MethodDefinition AddMethod(this TypeDefinition type, string methodName, MethodAttributes methodAttributes, TypeSignature returnType)
+	{
+		MethodDefinition method = CreateMethod(methodName, methodAttributes, returnType);
+		type.Methods.Add(method);
+		return method;
+	}
+
+	private static MethodDefinition CreateMethod(string methodName, MethodAttributes methodAttributes, TypeSignature returnType)
+	{
+		bool isStatic = (methodAttributes & MethodAttributes.Static) != 0;
+		MethodSignature methodSignature = isStatic
+			? MethodSignature.CreateStatic(returnType)
+			: MethodSignature.CreateInstance(returnType);
+		MethodDefinition result = new MethodDefinition(methodName, methodAttributes, methodSignature);
+
+		result.CilMethodBody = new CilMethodBody(result);
+
+		return result;
+	}
+
+	public static bool IsStaticClass(this TypeDefinition type)
+	{
+		return type.IsSealed && type.IsAbstract;
+	}
+}
@@ -1,4 +1,4 @@
-using AsmResolver.DotNet.Signatures.Types;
+using AsmResolver.DotNet.Signatures;

 namespace AssetRipper.CIL;

@@ -1,27 +1,27 @@
-<Project>
-	<PropertyGroup>
-		<LangVersion>Latest</LangVersion>
-		<Nullable>enable</Nullable>
-		<IsAotCompatible>true</IsAotCompatible>
-		<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-		<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
-
-		<Version>1.0.1</Version>
-		<AssemblyVersion>$(Version)</AssemblyVersion>
-		<Copyright>Copyright (c) 2024 ds5678</Copyright>
-		<Authors>ds5678</Authors>
-		<Company>AssetRipper</Company>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<RepositoryType>git</RepositoryType>
-		<RepositoryUrl>https://github.com/AssetRipper/AssetRipper.CIL</RepositoryUrl>
-		<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
-		<IsTrimmable>true</IsTrimmable>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-		<IsAotCompatible>true</IsAotCompatible>
-	</PropertyGroup>
+<Project>
+	<PropertyGroup>
+		<LangVersion>Latest</LangVersion>
+		<Nullable>enable</Nullable>
+		<IsAotCompatible>true</IsAotCompatible>
+		<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+		<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+
+		<Version>1.1.4</Version>
+		<AssemblyVersion>$(Version)</AssemblyVersion>
+		<Copyright>Copyright (c) 2024 ds5678</Copyright>
+		<Authors>ds5678</Authors>
+		<Company>AssetRipper</Company>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryUrl>https://github.com/AssetRipper/AssetRipper.CIL</RepositoryUrl>
+		<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+		<IsTrimmable>true</IsTrimmable>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+		<IsAotCompatible>true</IsAotCompatible>
+	</PropertyGroup>
 </Project>
Author	SHA1	Message	Date
ds5678	7e3e7bfa8c	Bump version	2025-01-11 01:07:46 -08:00
ds5678	777fb5ea1c	Fix AddLoadIndirect and AddStoreIndirect * Resolves #1	2025-01-11 01:07:24 -08:00
ds5678	be8f11f6b5	Fix incorrect field references for generic types	2025-01-10 23:47:59 -08:00
ds5678	1338ca2f95	Add method stubbing tool	2025-01-10 23:46:05 -08:00
ds5678	e95ff3bae6	Bump tools to .NET 9	2025-01-10 23:45:32 -08:00
ds5678	44cf58eef6	Bump version	2024-12-10 12:11:31 -08:00
ds5678	cb89ec09b2	Bump to .NET 9	2024-12-10 12:10:25 -08:00
ds5678	677f5349b3	CIL Manipulators	2024-09-23 23:26:35 -07:00
ds5678	7fd99d382d	Include exception handlers in validation	2024-09-23 21:13:35 -07:00
ds5678	2ad3472b3e	Forgot nullable attribute in event extensions	2024-09-07 12:58:58 -07:00
ds5678	c8e1b8809c	Bump version	2024-09-07 12:50:59 -07:00
ds5678	a0c48e0216	Backing field improvements * More strict identification * Add extensions for fields, events, and properties	2024-09-07 12:50:18 -07:00
ds5678	1df36de7df	Field extensions	2024-09-01 08:21:39 -07:00
ds5678	89d8b4a7cd	Event and property extensions	2024-09-01 08:15:23 -07:00
ds5678	9106df0c05	Version bump	2024-07-25 07:33:21 -07:00
ds5678	7f4f811679	More extensions	2024-07-25 07:32:35 -07:00
ds5678	2085e5f81e	For standardization, don't replace br false with br true	2024-07-21 10:58:12 -07:00
ds5678	5806496459	Handle switch instructions for macro standardization	2024-07-21 10:55:38 -07:00
ds5678	ecdd481b87	Add assembly validator project	2024-07-12 20:32:22 -07:00
ds5678	2e4fa07015	MacroStandardization	2024-07-09 23:35:26 -07:00
ds5678	995d4d5e05	Add more extension methods	2024-07-06 13:07:57 -04:00
ds5678	58e24a2bb2	Bump version	2024-06-15 23:27:34 -07:00
ds5678	88e6e617cf	Add more extension methods	2024-06-15 23:26:17 -07:00
ds5678	92dbe51e75	public MethodDefinitionExtensions	2024-06-15 20:45:24 -07:00
ds5678	0f996365c6	Make CilInstructionCollectionExtensions public	2024-06-15 20:14:18 -07:00
ds5678	5f3fbe86fe	Update to AsmResolver 6	2024-06-15 20:06:14 -07:00
ds5678	b49a6b2a75	Bump version	2024-04-14 15:03:55 -07:00
ds5678	ff8d07d1b4	Initialize struct fields	2024-04-14 15:02:13 -07:00