Merge pull request #159 from Washi1337/feature/upgrade-asmresolver

Upgrade to AsmResolver 6.0.0-rc.1

Author: Washi1337

Directory.Build.props

@@ -6,7 +6,7 @@
         <PackageLicense>https://github.com/Washi1337/Echo/LICENSE.md</PackageLicense>
         <RepositoryUrl>https://github.com/Washi1337/Echo</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <LangVersion>12</LangVersion>
+        <LangVersion>14</LangVersion>
         <Nullable>enable</Nullable>
         <VersionPrefix>1.0.0</VersionPrefix>
         <VersionSuffix>alpha.1</VersionSuffix>

src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj

@@ -22,7 +22,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" />
+      <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-rc.1" />
       <PackageReference Include="Nullable" Version="1.3.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Platforms/Echo.Platforms.AsmResolver/Emulation/CilVirtualMachine.cs

@@ -35,12 +35,12 @@ public class CilVirtualMachine
         /// </summary>
         /// <param name="contextModule">The main module to base the context on.</param>
         /// <param name="is32Bit">Indicates whether the virtual machine runs in 32-bit mode or 64-bit mode.</param>
-        public CilVirtualMachine(ModuleDefinition contextModule, bool is32Bit)
+        public CilVirtualMachine(RuntimeContext runtimeContext, bool is32Bit)
         {
             Memory = new VirtualMemory(is32Bit ? uint.MaxValue : long.MaxValue);
             Loader = new PELoader(Memory);
 
-            ValueFactory = new ValueFactory(contextModule, is32Bit);
+            ValueFactory = new ValueFactory(runtimeContext, is32Bit);
             HostObjects = new ObjectMapMemory<object, HostObject>(0x1000_0000, o => new HostObject(o, this));
             ObjectMarshaller = new ObjectMarshaller(this);
 
@@ -114,11 +114,8 @@ public ValueFactory ValueFactory
             get;
         }
 
-        /// <summary>
-        /// Gets the main module the emulator is executing instructions for.
-        /// </summary>
-        public ModuleDefinition ContextModule => ValueFactory.ContextModule;
-
+        public RuntimeContext RuntimeContext => ValueFactory.RuntimeContext;
+        
         /// <summary>
         /// Gets the service that is responsible for mapping executable files in memory.
         /// </summary>

src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs

@@ -31,8 +31,7 @@ private TypeSignature GetElementType(TypeSignature type)
                 case ElementType.ValueType:
                     if (!_resolvedTypes.TryGetValue(type, out var definition))
                     {
-                        definition = type.Resolve();
-                        if (definition is not null)
+                        if (type.TryResolve(_valueFactory.RuntimeContext, out definition))
                             _resolvedTypes.Add(type, definition);
                     }
 

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemHandler.cs

@@ -93,10 +93,10 @@ protected override CilDispatchResult DispatchInternal(CilExecutionContext contex
 
         private static TypeSignature GetElementType(CilExecutionContext context, CilInstruction instruction)
         {
-            var factory = context.Machine.ValueFactory.ContextModule.CorLibTypeFactory;
+            var factory = context.Machine.ValueFactory.CorLibTypeFactory;
             return instruction.OpCode.Code switch
             {
-                CilCode.Ldelem => ((ITypeDefOrRef) instruction.Operand!).ToTypeSignature(),
+                CilCode.Ldelem => ((ITypeDefOrRef) instruction.Operand!).ToTypeSignature(context.Machine.RuntimeContext),
                 CilCode.Ldelem_I => factory.IntPtr,
                 CilCode.Ldelem_I1 => factory.SByte,
                 CilCode.Ldelem_I2 => factory.Int16,

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemaHandler.cs

@@ -20,7 +20,10 @@ protected override CilDispatchResult DispatchInternal(CilExecutionContext contex
             var genericContext = GenericContext.FromMethod(context.CurrentFrame.Method);
 
             // Determine parameters.
-            var elementType = ((ITypeDefOrRef) instruction.Operand!).ToTypeSignature().InstantiateGenericTypes(genericContext);
+            var elementType = ((ITypeDefOrRef) instruction.Operand!)
+                .ToTypeSignature(context.RuntimeContext)
+                .InstantiateGenericTypes(genericContext);
+
             var arrayIndex = stack.Pop();
             var arrayAddress = stack.Pop();
             var result = factory.RentNativeInteger(false);

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/NewArrHandler.cs

@@ -1,7 +1,6 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
-using Echo.Memory;
 using Echo.Platforms.AsmResolver.Emulation.Stack;
 
 namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Arrays
@@ -19,8 +18,10 @@ protected override CilDispatchResult DispatchInternal(CilExecutionContext contex
             var factory = context.Machine.ValueFactory;
             var genericContext = GenericContext.FromMethod(context.CurrentFrame.Method);
 
-            var elementType = ((ITypeDefOrRef)instruction.Operand!).ToTypeSignature().InstantiateGenericTypes(genericContext);
             var elementCount = stack.Pop();
+            var elementType = ((ITypeDefOrRef)instruction.Operand!)
+                .ToTypeSignature(context.RuntimeContext)
+                .InstantiateGenericTypes(genericContext);
 
             try
             {

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/StElemHandler.cs

@@ -89,10 +89,10 @@ protected override CilDispatchResult DispatchInternal(CilExecutionContext contex
 
         private static TypeSignature GetElementType(CilExecutionContext context, CilInstruction instruction)
         {
-            var factory = context.Machine.ValueFactory.ContextModule.CorLibTypeFactory;
+            var factory = context.Machine.ValueFactory.CorLibTypeFactory;
             return instruction.OpCode.Code switch
             {
-                CilCode.Stelem => ((ITypeDefOrRef) instruction.Operand!).ToTypeSignature(),
+                CilCode.Stelem => ((ITypeDefOrRef) instruction.Operand!).ToTypeSignature(context.RuntimeContext),
                 CilCode.Stelem_I => factory.IntPtr,
                 CilCode.Stelem_I1 => factory.SByte,
                 CilCode.Stelem_I2 => factory.Int16,

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/CilExecutionContext.cs

@@ -1,4 +1,5 @@
 using System.Threading;
+using AsmResolver.DotNet;
 using Echo.Platforms.AsmResolver.Emulation.Stack;
 
 namespace Echo.Platforms.AsmResolver.Emulation.Dispatch
@@ -44,5 +45,7 @@ public CancellationToken CancellationToken
         {
             get;
         }
+
+        public RuntimeContext RuntimeContext => Machine.RuntimeContext;
     }
 }

src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ControlFlow/RetHandler.cs

@@ -35,7 +35,7 @@ public CilDispatchResult Dispatch(CilExecutionContext context, CilInstruction in
                 if (index != -1 && body.Instructions[index].OpCode.Code == CilCode.Newobj)
                 {
                     var resultingType = calleeFrame.Method.DeclaringType!
-                        .ToTypeSignature()
+                        .ToTypeSignature(context.RuntimeContext)
                         .InstantiateGenericTypes(genericContext);
 
                     var slot = CreateResultingStackSlot(