Add FieldRva initialization.

Washi1337 · Mar 20, 2024 · 8cb57ac · 8cb57ac
1 parent c77651d
commit 8cb57ac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Runtime/RuntimeTypeManager.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Runtime/RuntimeTypeManager.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using AsmResolver;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 
@@ -109,7 +110,7 @@ public TypeInitializerResult HandleInitialization(CilThread thread, ITypeDescrip
 
             // "Call" the constructor.
             initialization.ConstructorCalled = true;
-                
+
             // Actually find the constructor and call it if it is there.
             var cctor = definition.GetStaticConstructor();
             if (cctor is not null)

diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Runtime/StaticFieldStorage.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Runtime/StaticFieldStorage.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using AsmResolver;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using Echo.Memory;
@@ -51,6 +52,13 @@ public long GetFieldAddress(IFieldDescriptor field)
             {
                 var layout = _valueFactory.GetTypeValueMemoryLayout(field.Signature!.FieldType);
                 address = _heap.Allocate(layout.Size, true);
+
+                if (field.Resolve() is { IsStatic: true, HasFieldRva: true, FieldRva: IReadableSegment data } def)
+                {
+                    field = def;
+                    _heap.GetChunkSpan(address).Write(data.WriteIntoArray());
+                }
+
                 _fields.Add(field, address);
             }
 

diff --git a/...orms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs b/...orms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Linq;
 using System.Text;
+using AsmResolver;
 using AsmResolver.DotNet;
 using AsmResolver.PE.DotNet.Cil;
 using AsmResolver.PE.DotNet.Metadata.Tables.Rows;
@@ -80,4 +82,20 @@ public void ReadStaticInt32WithInitializer()
         Assert.False(slot.IsNull);
         Assert.Equal(ClassWithInitializer.Field, Encoding.Unicode.GetString(slot.ReadStringData().Bits));
     }
+
+    [Fact]
+    public void ReadStaticInt32WithFieldRva()
+    {
+        var field = new FieldDefinition(
+            "StaticInt32WithFieldRva", 
+            FieldAttributes.Static | FieldAttributes.HasFieldRva,
+            ModuleFixture.MockModule.CorLibTypeFactory.Int32
+        );
+        field.FieldRva = new DataSegment(BitConverter.GetBytes(1337));
+
+        var result = Dispatcher.Dispatch(Context, new CilInstruction(CilOpCodes.Ldsfld, field));
+
+        Assert.True(result.IsSuccess);
+        Assert.Equal(1337, Assert.Single(Context.CurrentFrame.EvaluationStack).Contents.AsSpan().I32);
+    }
 }