Progress

CLAUDE.md

@@ -67,12 +67,13 @@ dotnet run --project WoofWare.PawPrint.App/WoofWare.PawPrint.App.fsproj -- CShar
 - `Corelib.fs`: Core library type definitions (String, Array, etc.)
 
 **WoofWare.PawPrint.Test**
-- Uses NUnit as the test framework
+- Uses Expecto as the test framework
 - Test cases are defined in `TestPureCases.fs` and `TestImpureCases.fs`
-- C# source files in `sources{Pure,Impure}/` are compiled and executed by the runtime as test cases; files in `sourcesPure` are automatically turned into test cases with no further action (see TestPureCases.fs for the mechanism)
+- C# source files in `sources{Pure,Impure}/` are compiled and executed by the runtime as test cases
 - `TestHarness.fs` provides infrastructure for running test assemblies through the interpreter
 - Run all tests with `dotnet run --project WoofWare.PawPrint.Test/WoofWare.PawPrint.Test.fsproj -- --no-spinner` (note the additional `--`)
 - Run a specific test with `dotnet run --project WoofWare.PawPrint.Test/WoofWare.PawPrint.Test.fsproj -- --filter-test-case StringWithinTestName --no-spinner`
+- Pending test definitions must be moved into the non-pending test case list before they can be run.
 
 **WoofWare.PawPrint.App**
 - Entry point application for running the interpreter

CSharpExample/CSharpExample.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net10.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <OutputType>Exe</OutputType>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <WarningsAsErrors>false</WarningsAsErrors>

HelloWorld/HelloWorld.fsproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
       <OutputType>Exe</OutputType>
-      <TargetFramework>net10.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <SelfContained>true</SelfContained>
     </PropertyGroup>
 

WoofWare.PawPrint.App/WoofWare.PawPrint.App.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

WoofWare.PawPrint.Domain/Assembly.fs

@@ -565,7 +565,6 @@ module DumpedAssembly =
         (bct : BaseClassTypes<DumpedAssembly>)
         (assemblies : ImmutableDictionary<string, DumpedAssembly>)
         (ti : TypeInfo<TypeDefn, TypeDefn>)
-        : TypeDefn
         =
         ti
         |> TypeInfo.toTypeDefn

WoofWare.PawPrint.Domain/ConcreteType.fs

@@ -33,20 +33,6 @@ type ConcreteType<'typeGeneric> =
             _Generics : ImmutableArray<'typeGeneric>
         }
 
-    override this.ToString () : string =
-        let basic = $"%s{this.Assembly.Name}.%s{this.Namespace}.%s{this.Name}"
-
-        let generics =
-            if this.Generics.IsEmpty then
-                ""
-            else
-                this.Generics
-                |> Seq.map string
-                |> String.concat ", "
-                |> fun x -> "<" + x + ">"
-
-        basic + generics
-
     member this.Assembly : AssemblyName = this._AssemblyName
     member this.Definition : ComparableTypeDefinitionHandle = this._Definition
     member this.Generics : ImmutableArray<'typeGeneric> = this._Generics

WoofWare.PawPrint.Domain/FieldInfo.fs

@@ -57,10 +57,11 @@ module FieldInfo =
         let fieldSig = def.DecodeSignature (TypeDefn.typeProvider assembly, ())
         let declaringType = def.GetDeclaringType ()
 
+        let typeGenerics =
+            mr.GetTypeDefinition(declaringType).GetGenericParameters ()
+            |> GenericParameter.readAll mr
+
         let decType = mr.GetTypeDefinition declaringType
-
-        let typeGenerics = decType.GetGenericParameters () |> GenericParameter.readAll mr
-
         let declaringTypeNamespace = mr.GetString decType.Namespace
         let declaringTypeName = mr.GetString decType.Name
 

WoofWare.PawPrint.Domain/TypeConcretisation.fs

@@ -183,24 +183,6 @@ module ConcreteActivePatterns =
             | _ -> None
         | _ -> None
 
-    let (|ConcreteGenericArray|_|)
-        (concreteTypes : AllConcreteTypes)
-        (eltType : ConcreteTypeHandle)
-        (handle : ConcreteTypeHandle)
-        =
-        match handle with
-        | ConcreteTypeHandle.Concrete id ->
-            match concreteTypes.Mapping |> Map.tryFind id with
-            | Some ct when
-                ct.Assembly.Name = "System.Private.CoreLib"
-                && ct.Namespace = "System"
-                && ct.Name = "Array"
-                && Seq.tryExactlyOne ct.Generics = Some eltType
-                ->
-                Some ()
-            | _ -> None
-        | _ -> None
-
     let (|ConcreteObj|_|) (concreteTypes : AllConcreteTypes) (handle : ConcreteTypeHandle) : unit option =
         match handle with
         | ConcreteTypeHandle.Concrete id ->
@@ -320,40 +302,6 @@ module ConcreteActivePatterns =
             | None -> None
         | _ -> None
 
-    let (|ConcreteUInt32|_|) (concreteTypes : AllConcreteTypes) (handle : ConcreteTypeHandle) : unit option =
-        match handle with
-        | ConcreteTypeHandle.Concrete id ->
-            match concreteTypes.Mapping |> Map.tryFind id with
-            | Some ct ->
-                if
-                    ct.Assembly.Name = "System.Private.CoreLib"
-                    && ct.Namespace = "System"
-                    && ct.Name = "UInt32"
-                    && ct.Generics.IsEmpty
-                then
-                    Some ()
-                else
-                    None
-            | None -> None
-        | _ -> None
-
-    let (|ConcreteUInt64|_|) (concreteTypes : AllConcreteTypes) (handle : ConcreteTypeHandle) : unit option =
-        match handle with
-        | ConcreteTypeHandle.Concrete id ->
-            match concreteTypes.Mapping |> Map.tryFind id with
-            | Some ct ->
-                if
-                    ct.Assembly.Name = "System.Private.CoreLib"
-                    && ct.Namespace = "System"
-                    && ct.Name = "UInt64"
-                    && ct.Generics.IsEmpty
-                then
-                    Some ()
-                else
-                    None
-            | None -> None
-        | _ -> None
-
     let (|ConcreteSingle|_|) (concreteTypes : AllConcreteTypes) (handle : ConcreteTypeHandle) : unit option =
         match handle with
         | ConcreteTypeHandle.Concrete id ->

WoofWare.PawPrint.Domain/TypeDefn.fs

@@ -6,8 +6,6 @@ open System.Reflection.Metadata
 open System.Reflection.Metadata.Ecma335
 open Microsoft.FSharp.Core
 
-[<RequireQualifiedAccess>]
-[<NoComparison>]
 type ResolvedBaseType =
     | Enum
     | ValueType
@@ -169,8 +167,8 @@ module PrimitiveType =
         | PrimitiveType.Double -> 8
         | PrimitiveType.String -> 8
         | PrimitiveType.TypedReference -> failwith "todo"
-        | PrimitiveType.IntPtr -> NATIVE_INT_SIZE
-        | PrimitiveType.UIntPtr -> NATIVE_INT_SIZE
+        | PrimitiveType.IntPtr -> 8
+        | PrimitiveType.UIntPtr -> 8
         | PrimitiveType.Object -> 8
 
 type TypeDefn =

WoofWare.PawPrint.Domain/TypeInfo.fs

@@ -29,10 +29,6 @@ type InterfaceImplementation =
         RelativeToAssembly : AssemblyName
     }
 
-type Layout =
-    | Default
-    | Custom of size : int * packingSize : int
-
 /// <summary>
 /// Represents detailed information about a type definition in a .NET assembly.
 /// This is a strongly-typed representation of TypeDefinition from System.Reflection.Metadata.
@@ -97,8 +93,6 @@ type TypeInfo<'generic, 'fieldGeneric> =
         Events : EventDefn ImmutableArray
 
         ImplementedInterfaces : InterfaceImplementation ImmutableArray
-
-        Layout : Layout
     }
 
     member this.IsInterface = this.TypeAttributes.HasFlag TypeAttributes.Interface
@@ -190,18 +184,6 @@ type BaseClassTypes<'corelib> =
         TypedReference : TypeInfo<GenericParamFromMetadata, TypeDefn>
         IntPtr : TypeInfo<GenericParamFromMetadata, TypeDefn>
         UIntPtr : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        Exception : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        ArithmeticException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        DivideByZeroException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        OverflowException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        StackOverflowException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        TypeLoadException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        IndexOutOfRangeException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        InvalidCastException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        MissingFieldException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        MissingMethodException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        NullReferenceException : TypeInfo<GenericParamFromMetadata, TypeDefn>
-        OutOfMemoryException : TypeInfo<GenericParamFromMetadata, TypeDefn>
     }
 
 [<RequireQualifiedAccess>]
@@ -231,7 +213,6 @@ module TypeInfo =
             Generics = gen
             Events = t.Events
             ImplementedInterfaces = t.ImplementedInterfaces
-            Layout = t.Layout
         }
 
     let mapGeneric<'a, 'b, 'field> (f : 'a -> 'b) (t : TypeInfo<'a, 'field>) : TypeInfo<'b, 'field> =
@@ -327,14 +308,6 @@ module TypeInfo =
 
             result.ToImmutable ()
 
-        let layout =
-            let l = typeDef.GetLayout ()
-
-            if l.IsDefault then
-                Layout.Default
-            else
-                Layout.Custom (size = l.Size, packingSize = l.PackingSize)
-
         {
             Namespace = ns
             Name = name
@@ -350,7 +323,6 @@ module TypeInfo =
             Events = events
             ImplementedInterfaces = interfaces
             DeclaringType = declaringType
-            Layout = layout
         }
 
     let isBaseType<'corelib>

WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj

@@ -7,7 +7,6 @@
 
     <ItemGroup>
         <Compile Include="StringToken.fs" />
-        <Compile Include="Constants.fs" />
         <Compile Include="ImmutableArray.fs" />
         <Compile Include="Tokens.fs" />
         <Compile Include="TypeRef.fs" />

WoofWare.PawPrint.Test/LoggerFactory.fs

@@ -23,7 +23,7 @@ module LoggerFactory =
     let makeTest () : (unit -> LogLine list) * ILoggerFactory =
         // Shared sink for all loggers created by the factory.
         let sink = ResizeArray ()
-        let isEnabled (logLevel : LogLevel) : bool = logLevel >= LogLevel.Information
+        let isEnabled (logLevel : LogLevel) : bool = logLevel >= LogLevel.Debug
 
         let createLogger (category : string) : ILogger =
             { new ILogger with

WoofWare.PawPrint.Test/TestImpureCases.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.Pawprint.Test
 
-open System
 open System.Collections.Immutable
 open System.IO
 open FsUnitTyped

WoofWare.PawPrint.Test/TestPureCases.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.Pawprint.Test
 
-open System
 open System.Collections.Immutable
 open System.IO
 open FsUnitTyped
@@ -17,65 +16,161 @@ module TestPureCases =
 
     let unimplemented =
         [
-            "CrossAssemblyTypes.cs"
-            "OverlappingStructs.cs"
-            "AdvancedStructLayout.cs"
-            "InitializeArray.cs"
-            "Threads.cs"
-            "ComplexTryCatch.cs"
-            "ResizeArray.cs"
-            "LdtokenField.cs"
-            "GenericEdgeCases.cs"
-            "UnsafeAs.cs"
+            {
+                FileName = "CrossAssemblyTypes.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "OverlappingStructs.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "AdvancedStructLayout.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "InitializeArray.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Threads.cs"
+                ExpectedReturnCode = 3
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "ComplexTryCatch.cs"
+                ExpectedReturnCode = 14
+                NativeImpls = NativeImpls.PassThru ()
+            }
+            {
+                FileName = "ResizeArray.cs"
+                ExpectedReturnCode = 114
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Sizeof.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "LdtokenField.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
         ]
-        |> Set.ofList
-
-    let requiresMocks =
-        let empty = MockEnv.make ()
 
+    let cases : EndToEndTestCase list =
         [
-            "BasicLock.cs",
-            (1,
-             { empty with
-                 System_Threading_Monitor = System_Threading_Monitor.passThru
-             })
+            {
+                FileName = "NoOp.cs"
+                ExpectedReturnCode = 1
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "UnsafeAs.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Initobj.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "GenericEdgeCases.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "TestShl.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "TestShr.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "StaticVariables.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Ldind.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "CustomDelegate.cs"
+                ExpectedReturnCode = 8
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "ArgumentOrdering.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "BasicLock.cs"
+                ExpectedReturnCode = 1
+                NativeImpls =
+                    let mock = MockEnv.make ()
+
+                    { mock with
+                        System_Threading_Monitor = System_Threading_Monitor.passThru
+                    }
+            }
+            {
+                FileName = "TriangleNumber.cs"
+                ExpectedReturnCode = 10
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "ExceptionWithNoOpFinally.cs"
+                ExpectedReturnCode = 3
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "ExceptionWithNoOpCatch.cs"
+                ExpectedReturnCode = 10
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Floats.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "TryCatchWithThrowInBody.cs"
+                ExpectedReturnCode = 4
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "Ldelema.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "TypeConcretization.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "TestOr.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
+            {
+                FileName = "InterfaceDispatch.cs"
+                ExpectedReturnCode = 0
+                NativeImpls = MockEnv.make ()
+            }
         ]
-        |> Map.ofList
-
-    let customExitCodes =
-        [
-            "NoOp.cs", 1
-            "CustomDelegate.cs", 8
-            "ExceptionWithNoOpFinally.cs", 3
-            "ExceptionWithNoOpCatch.cs", 10
-            "TryCatchWithThrowInBody.cs", 4
-            "ResizeArray.cs", 114
-            "Threads.cs", 3
-            "TriangleNumber.cs", 10
-        ]
-        |> Map.ofList
-
-    let allPure =
-        assy.GetManifestResourceNames ()
-        |> Seq.choose (fun res ->
-            let s = "WoofWare.PawPrint.Test.sourcesPure."
-
-            if res.StartsWith (s, StringComparison.OrdinalIgnoreCase) then
-                res.Substring s.Length |> Some
-            else
-                None
-        )
-        |> Set.ofSeq
-
-    let simpleCases : string list =
-        allPure
-        |> Seq.filter (fun s ->
-            (customExitCodes.ContainsKey s
-             || requiresMocks.ContainsKey s
-             || unimplemented.Contains s)
-            |> not
-        )
-        |> Seq.toList
 
     let runTest (case : EndToEndTestCase) : unit =
         let source = Assembly.getEmbeddedResourceAsString case.FileName assy
@@ -110,43 +205,9 @@ module TestPureCases =
 
             reraise ()
 
-    [<TestCaseSource(nameof simpleCases)>]
-    let ``Standard tests`` (fileName : string) =
-        {
-            FileName = fileName
-            ExpectedReturnCode = 0
-            NativeImpls = MockEnv.make ()
-        }
-        |> runTest
-
-    [<TestCaseSource(nameof customExitCodes)>]
-    let ``Custom exit code tests`` (KeyValue (fileName : string, exitCode : int)) =
-        if unimplemented.Contains fileName then
-            Assert.Inconclusive ()
-
-        {
-            FileName = fileName
-            ExpectedReturnCode = exitCode
-            NativeImpls = MockEnv.make ()
-        }
-        |> runTest
-
-    [<TestCaseSource(nameof requiresMocks)>]
-    let ``Tests which require mocks`` (KeyValue (fileName : string, (exitCode : int, mock : NativeImpls))) =
-        {
-            FileName = fileName
-            ExpectedReturnCode = exitCode
-            NativeImpls = mock
-        }
-        |> runTest
-
-
     [<TestCaseSource(nameof unimplemented)>]
     [<Explicit>]
-    let ``Can evaluate C# files, unimplemented`` (fileName : string) =
-        {
-            FileName = fileName
-            ExpectedReturnCode = 0
-            NativeImpls = MockEnv.make ()
-        }
-        |> runTest
+    let ``Can evaluate C# files, unimplemented`` (case : EndToEndTestCase) = runTest case
+
+    [<TestCaseSource(nameof cases)>]
+    let ``Can evaluate C# files`` (case : EndToEndTestCase) = runTest case

WoofWare.PawPrint.Test/WoofWare.PawPrint.Test.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
   </PropertyGroup>

WoofWare.PawPrint.Test/sourcesPure/ComparisonOperations.cs

@@ -1,255 +0,0 @@
-public class TestComparisonOperations
-{
-    // Test Ceq: Compare equal
-    public static int TestCompareEqual()
-    {
-        // Integer equality
-        if ((5 == 5) != true) return 1;
-        if ((5 == 6) != false) return 2;
-        if ((int.MaxValue == int.MaxValue) != true) return 3;
-        if ((int.MinValue == int.MaxValue) != false) return 4;
-        
-        // Negative numbers
-        if ((-1 == -1) != true) return 5;
-        if ((-5 == 5) != false) return 6;
-        
-        // Long equality
-        if ((100L == 100L) != true) return 7;
-        if ((100L == 101L) != false) return 8;
-        
-        // Mixed sizes (after promotion)
-        int i = 42;
-        long l = 42L;
-        if ((l == (long)i) != true) return 9;
-        
-        // Zero comparisons
-        if ((0 == 0) != true) return 10;
-        if ((0 == 1) != false) return 11;
-        
-        return 0;
-    }
-    
-    // Test Cgt: Compare greater than (signed)
-    public static int TestCompareGreaterThan()
-    {
-        // Positive integers
-        if ((10 > 5) != true) return 20;
-        if ((5 > 10) != false) return 21;
-        if ((5 > 5) != false) return 22;
-        
-        // Negative integers
-        if ((-5 > -10) != true) return 23;
-        if ((-10 > -5) != false) return 24;
-        if ((5 > -5) != true) return 25;
-        if ((-5 > 5) != false) return 26;
-        
-        // Boundary values
-        if ((int.MaxValue > int.MinValue) != true) return 27;
-        if ((int.MinValue > int.MaxValue) != false) return 28;
-        if ((int.MaxValue > (int.MaxValue - 1)) != true) return 29;
-        
-        // Zero comparisons
-        if ((1 > 0) != true) return 30;
-        if ((0 > 1) != false) return 31;
-        if ((-1 > 0) != false) return 32;
-        if ((0 > -1) != true) return 33;
-        
-        return 0;
-    }
-    
-    // Test Cgt_un: Compare greater than (unsigned)
-    public static int TestCompareGreaterThanUnsigned()
-    {
-        uint a = 10;
-        uint b = 5;
-        
-        // Basic unsigned comparison
-        if ((a > b) != true) return 40;
-        if ((b > a) != false) return 41;
-        if ((a > a) != false) return 42;
-        
-        // High bit set (would be negative if signed)
-        uint high = 0x80000000;
-        uint low = 0x7FFFFFFF;
-        if ((high > low) != true) return 43;  // Unsigned: high > low
-        
-        // Maximum values
-        uint max = uint.MaxValue;
-        uint min = uint.MinValue;
-        if ((max > min) != true) return 44;
-        if ((min > max) != false) return 45;
-        
-        // Interpret negative as unsigned
-        uint negAsUint = unchecked((uint)-1);
-        uint one = 1;
-        if ((negAsUint > one) != true) return 46;  // 0xFFFFFFFF > 1
-        
-        return 0;
-    }
-    
-    // Test Clt: Compare less than (signed)
-    public static int TestCompareLessThan()
-    {
-        // Positive integers
-        if ((5 < 10) != true) return 50;
-        if ((10 < 5) != false) return 51;
-        if ((5 < 5) != false) return 52;
-        
-        // Negative integers
-        if ((-10 < -5) != true) return 53;
-        if ((-5 < -10) != false) return 54;
-        if ((-5 < 5) != true) return 55;
-        if ((5 < -5) != false) return 56;
-        
-        // Boundary values
-        if ((int.MinValue < int.MaxValue) != true) return 57;
-        if ((int.MaxValue < int.MinValue) != false) return 58;
-        
-        // Zero comparisons
-        if ((0 < 1) != true) return 59;
-        if ((1 < 0) != false) return 60;
-        if ((0 < -1) != false) return 61;
-        if ((-1 < 0) != true) return 62;
-        
-        return 0;
-    }
-    
-    // Test Clt_un: Compare less than (unsigned)
-    public static int TestCompareLessThanUnsigned()
-    {
-        uint a = 5;
-        uint b = 10;
-        
-        // Basic unsigned comparison
-        if ((a < b) != true) return 70;
-        if ((b < a) != false) return 71;
-        if ((a < a) != false) return 72;
-        
-        // High bit set
-        uint high = 0x80000000;
-        uint low = 0x7FFFFFFF;
-        if ((low < high) != true) return 73;  // Unsigned: low < high
-        
-        // Boundary values
-        uint max = uint.MaxValue;
-        uint min = uint.MinValue;
-        if ((min < max) != true) return 74;
-        if ((max < min) != false) return 75;
-        
-        // Negative as unsigned
-        uint one = 1;
-        uint negAsUint = unchecked((uint)-1);
-        if ((one < negAsUint) != true) return 76;  // 1 < 0xFFFFFFFF
-        
-        return 0;
-    }
-    
-    // Test comparison combinations
-    public static int TestComparisonCombinations()
-    {
-        int x = 10;
-        int y = 20;
-        int z = 10;
-        
-        // Equality chains
-        if ((x == z) != true) return 80;
-        if ((x == y) != false) return 81;
-        
-        // Inequality combinations
-        if ((x < y && y > x) != true) return 82;
-        if ((x < y && x == y) != false) return 83;
-        
-        // Transitive comparisons
-        if (x < y && y < 30)
-        {
-            if ((x < 30) != true) return 84;
-        }
-        else
-        {
-            return 85;
-        }
-        
-        return 0;
-    }
-    
-    // Test comparisons with different types
-    public static int TestMixedTypeComparisons()
-    {
-        // byte comparisons (unsigned by default)
-        byte b1 = 200;
-        byte b2 = 100;
-        if ((b1 > b2) != true) return 90;
-        
-        // sbyte comparisons (signed)
-        sbyte sb1 = -50;
-        sbyte sb2 = 50;
-        if ((sb1 < sb2) != true) return 91;
-        
-        // short comparisons
-        short s1 = -1000;
-        short s2 = 1000;
-        if ((s1 < s2) != true) return 92;
-        if ((s1 == s2) != false) return 93;
-        
-        // long comparisons
-        long l1 = long.MaxValue;
-        long l2 = long.MinValue;
-        if ((l1 > l2) != true) return 94;
-        
-        return 0;
-    }
-    
-    // Test null comparisons
-    public static int TestNullComparisons()
-    {
-        object obj1 = null;
-        object obj2 = null;
-        object obj3 = new object();
-        
-        // Null equality
-        if ((obj1 == obj2) != true) return 100;
-        if ((obj1 == obj3) != false) return 101;
-        if ((obj3 == obj1) != false) return 102;
-        
-        // String null comparisons
-        string s1 = null;
-        string s2 = null;
-        string s3 = "";
-        
-        if ((s1 == s2) != true) return 103;
-        if ((s1 == s3) != false) return 104;
-        
-        return 0;
-    }
-    
-    public static int Main(string[] argv)
-    {
-        int result;
-        
-        result = TestCompareEqual();
-        if (result != 0) return 100 + result;
-        
-        result = TestCompareGreaterThan();
-        if (result != 0) return 200 + result;
-        
-        result = TestCompareGreaterThanUnsigned();
-        if (result != 0) return 300 + result;
-        
-        result = TestCompareLessThan();
-        if (result != 0) return 400 + result;
-        
-        result = TestCompareLessThanUnsigned();
-        if (result != 0) return 500 + result;
-        
-        result = TestComparisonCombinations();
-        if (result != 0) return 600 + result;
-        
-        result = TestMixedTypeComparisons();
-        if (result != 0) return 700 + result;
-        
-        result = TestNullComparisons();
-        if (result != 0) return 800 + result;
-        
-        return 0;
-    }
-}

WoofWare.PawPrint.Test/sourcesPure/OverlappingStructs.cs

@@ -323,10 +323,10 @@ public class StructLayoutTests
     {
         int result = 0;
 
-        result = TestExplicitUnion();
+        result = TestSequentialLayout();
         if (result != 0) return result;
 
-        result = TestSequentialLayout();
+        result = TestExplicitUnion();
         if (result != 0) return result;
 
         result = TestFixedSizeStruct();

WoofWare.PawPrint.Test/sourcesPure/Sizeof.cs

@@ -10,16 +10,16 @@ unsafe public class Program
 
     public struct MediumStruct
     {
-        public int MediumValue1;
-        public int MediumValue2;
+        public int Value1;
+        public int Value2;
     }
 
     public struct LargeStruct
     {
-        public long LongValue1;
-        public long LongValue2;
-        public long LongValue3;
-        public long LongValue4;
+        public long Value1;
+        public long Value2;
+        public long Value3;
+        public long Value4;
     }
 
     public struct NestedStruct

WoofWare.PawPrint.Test/sourcesPure/Sizeof2.cs

@@ -1,235 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-unsafe public class Program
-{
-    // Test for empty struct (should be 1 byte, not 0)
-    public struct EmptyStruct
-    {
-    }
-
-    // Test for char alignment (should align to 2, not 1)
-    public struct CharStruct
-    {
-        public byte B;
-        public char C;  // Should be at offset 2, not 1
-    }
-
-    // Test for end padding
-    public struct NeedsEndPadding
-    {
-        public int X;
-        public byte Y;
-        // Should pad to 8 bytes total (multiple of 4)
-    }
-
-    // Test Pack=1 (no padding)
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct PackedStruct
-    {
-        public byte B;
-        public int I;   // At offset 1, not 4
-        public byte B2;
-        // Total 6 bytes, no padding
-    }
-
-    // Test Pack=2
-    [StructLayout(LayoutKind.Sequential, Pack = 2)]
-    public struct Pack2Struct
-    {
-        public byte B;
-        public int I;   // At offset 2 (2-byte aligned, not 4)
-        public byte B2;
-        // Should pad to 8 bytes (multiple of 2)
-    }
-
-    // Test custom size smaller than natural size
-    [StructLayout(LayoutKind.Sequential, Size = 12)]
-    public struct CustomSizeSmaller
-    {
-        public long L1;
-        public long L2;
-        // Natural size is 16, but Size=12 is ignored (12 < 16)
-    }
-
-    // Test custom size larger than natural size
-    [StructLayout(LayoutKind.Sequential, Size = 20)]
-    public struct CustomSizeLarger
-    {
-        public long L;
-        // Natural size is 8, custom size 20 should win
-    }
-
-    // Test custom size not multiple of alignment
-    [StructLayout(LayoutKind.Sequential, Size = 15)]
-    public struct CustomSizeOdd
-    {
-        public long L;
-        // Size=15 should be honored even though not multiple of 8
-    }
-
-    // Test Pack=0 (means default, not 0)
-    [StructLayout(LayoutKind.Sequential, Pack = 0)]
-    public struct Pack0Struct
-    {
-        public byte B;
-        public int I;  // Should be at offset 4 (default packing)
-    }
-
-    // Test both Pack and Size
-    [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 10)]
-    public struct PackAndSize
-    {
-        public byte B;
-        public int I;
-        // Natural packed size is 5, custom size 10 should win
-    }
-
-    // Test explicit with custom Size
-    [StructLayout(LayoutKind.Explicit, Size = 10)]
-    public struct ExplicitWithSize
-    {
-        [FieldOffset(0)]
-        public int I;
-        [FieldOffset(2)]
-        public short S;
-        // Max offset+size is 4, but Size=10 should win
-    }
-
-    public struct SmallStruct
-    {
-        public byte Value;
-    }
-
-    public struct MediumStruct
-    {
-        public int MediumValue1;
-        public int MediumValue2;
-    }
-
-    public struct LargeStruct
-    {
-        public long LongValue1;
-        public long LongValue2;
-        public long LongValue3;
-        public long LongValue4;
-    }
-
-    public struct NestedStruct
-    {
-        public SmallStruct Small;
-        public MediumStruct Medium;
-        public int Extra;
-    }
-
-    [StructLayout(LayoutKind.Explicit)]
-    public struct UnionStruct
-    {
-        [FieldOffset(0)]
-        public int AsInt;
-        [FieldOffset(0)]
-        public float AsFloat;
-    }
-
-    public static int Main(string[] args)
-    {
-        // Test 1: Basic primitive types
-        if (sizeof(byte) != 1) return 1;
-        if (sizeof(sbyte) != 1) return 2;
-        if (sizeof(short) != 2) return 3;
-        if (sizeof(ushort) != 2) return 4;
-        if (sizeof(int) != 4) return 5;
-        if (sizeof(uint) != 4) return 6;
-        if (sizeof(long) != 8) return 7;
-        if (sizeof(ulong) != 8) return 8;
-        if (sizeof(float) != 4) return 9;
-        if (sizeof(double) != 8) return 10;
-        if (sizeof(char) != 2) return 11;
-        if (sizeof(bool) != 1) return 12;
-
-        // Test 2: Struct sizes
-        if (sizeof(SmallStruct) != 1) return 13;
-        if (sizeof(MediumStruct) != 8) return 14;
-        if (sizeof(LargeStruct) != 32) return 15;
-
-        // Test 3: Nested struct size
-        // SmallStruct (1) + padding (3) + MediumStruct (8) + int (4) = 16
-        if (sizeof(NestedStruct) != 16) return 16;
-
-        // Test 4: Union struct size
-        if (sizeof(UnionStruct) != 4) return 17;
-
-        // Test 5: Enum size (underlying type is int)
-        if (sizeof(DayOfWeek) != 4) return 18;
-
-        // Test 6: Empty struct (should be 1, not 0)
-        if (sizeof(EmptyStruct) != 1) return 19;
-
-        // Test 7: Char alignment
-        // byte (1) + padding (1) + char (2) = 4
-        if (sizeof(CharStruct) != 4) return 20;
-
-        // Test 8: End padding
-        // int (4) + byte (1) + padding (3) = 8
-        if (sizeof(NeedsEndPadding) != 8) return 21;
-
-        // Test 9: Pack=1 removes all padding
-        // byte (1) + int (4) + byte (1) = 6
-        if (sizeof(PackedStruct) != 6) return 22;
-
-        // Test 10: Pack=2
-        // byte (1) + padding (1) + int (4) + byte (1) + padding (1) = 8
-        if (sizeof(Pack2Struct) != 8) return 23;
-
-        // Test 11: Custom size smaller than natural (ignored)
-        if (sizeof(CustomSizeSmaller) != 16) return 24;
-
-        // Test 12: Custom size larger than natural (honored)
-        if (sizeof(CustomSizeLarger) != 20) return 25;
-
-        // Test 13: Custom size not multiple of alignment (honored)
-        if (sizeof(CustomSizeOdd) != 15) return 26;
-
-        // Test 14: Pack=0 means default packing
-        // byte (1) + padding (3) + int (4) = 8
-        if (sizeof(Pack0Struct) != 8) return 27;
-
-        // Test 15: Pack and Size together
-        // Natural packed: byte (1) + int (4) = 5, but Size=10
-        if (sizeof(PackAndSize) != 10) return 28;
-
-        // Test 16: Explicit with Size
-        // Max used is 4, but Size=10
-        if (sizeof(ExplicitWithSize) != 10) return 29;
-
-        // Test 17: Pointer types
-        unsafe
-        {
-            if (sizeof(IntPtr) != sizeof(void*)) return 30;
-            if (sizeof(UIntPtr) != sizeof(void*)) return 31;
-        }
-
-        // Test 18: Using sizeof in expressions
-        int totalSize = sizeof(int) + sizeof(long) + sizeof(byte);
-        if (totalSize != 13) return 32;
-
-        // Test 19: Array element size calculation
-        int arrayElementSize = sizeof(MediumStruct);
-        int arraySize = arrayElementSize * 3;
-        if (arraySize != 24) return 33;
-
-        // Test 20: Complex nested struct with Pack
-        // byte (1) + CharStruct (4) + byte (1) = 6
-        if (sizeof(PackedNested) != 6) return 34;
-
-        return 0;
-    }
-
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    struct PackedNested
-    {
-        public byte B;
-        public CharStruct C;
-        public byte B2;
-    }
-}

WoofWare.PawPrint.Test/sourcesPure/StackOperations.cs

@@ -1,184 +0,0 @@
-public class TestStackOperations
-{
-    // Test LdArg0-3: Load method arguments
-    public static int TestLoadArguments(int arg0, int arg1, int arg2, int arg3)
-    {
-        // LdArg0 loads 'this' for instance methods or first arg for static
-        if (arg0 != 10) return 1;
-
-        // LdArg1 loads second argument
-        if (arg1 != 20) return 2;
-
-        // LdArg2 loads third argument
-        if (arg2 != 30) return 3;
-
-        // LdArg3 loads fourth argument
-        if (arg3 != 40) return 4;
-
-        return 0;
-    }
-
-    // Test Ldloc_0-3 and Stloc_0-3: Load/store local variables
-    public static int TestLocalVariables()
-    {
-        int local0 = 100;
-        int local1 = 200;
-        int local2 = 300;
-        int local3 = 400;
-
-        // Test loading locals
-        if (local0 != 100) return 10;
-        if (local1 != 200) return 11;
-        if (local2 != 300) return 12;
-        if (local3 != 400) return 13;
-
-        // Test storing to locals
-        local0 = local1 + local2;  // Stloc_0
-        if (local0 != 500) return 14;
-
-        local1 = local2 * 2;  // Stloc_1
-        if (local1 != 600) return 15;
-
-        local2 = local3 - 100;  // Stloc_2
-        if (local2 != 300) return 16;
-
-        local3 = local0 / 5;  // Stloc_3
-        if (local3 != 100) return 17;
-
-        return 0;
-    }
-
-    // Test Pop: Remove top stack value
-    public static int TestPop()
-    {
-        int value = 42;
-
-        // Push value on stack then pop it
-        PushAndPop(value);
-
-        // If we get here, pop worked
-        return 0;
-    }
-
-    private static void PushAndPop(int value)
-    {
-        // The compiler will generate pop instructions
-        // for unused return values
-        GetValue();
-        GetValue();
-    }
-
-    private static int GetValue()
-    {
-        return 123;
-    }
-
-    // Test Dup: Duplicate top stack value
-    public static int TestDup()
-    {
-        int value = 50;
-
-        // Dup is used when same value is needed twice
-        int result1 = value * value;  // Compiler may use dup here
-        if (result1 != 2500) return 20;
-
-        // More complex dup scenario
-        int x = 10;
-        int result2 = AddTwice(x);
-        if (result2 != 20) return 21;
-
-        return 0;
-    }
-
-    private static int AddTwice(int val)
-    {
-        // Compiler may generate dup to use val twice
-        return val + val;
-    }
-
-    // Test Ret: Return from method
-    public static int TestReturn()
-    {
-        // Test void return
-        VoidReturn();
-
-        // Test value return
-        int result = ValueReturn(5);
-        if (result != 5) return 30;
-
-        // Test early return
-        result = EarlyReturn(true);
-        if (result != 1) return 31;
-
-        result = EarlyReturn(false);
-        if (result != 2) return 32;
-
-        return 0;
-    }
-
-    private static void VoidReturn()
-    {
-        // Ret with no value
-        return;
-    }
-
-    private static int ValueReturn(int x)
-    {
-        // Ret with value
-        return x;
-    }
-
-    private static int EarlyReturn(bool condition)
-    {
-        if (condition)
-            return 1;  // Early ret
-
-        return 2;  // Normal ret
-    }
-
-    // Test combinations of stack operations
-    public static int TestStackCombinations()
-    {
-        int a = 10, b = 20, c = 30;
-
-        // Complex expression using multiple locals
-        int result = (a + b) * c - (b - a);
-        if (result != 890) return 40;
-
-        // Nested method calls
-        result = Compute(a, Compute(b, c));
-        if (result != 60) return 41;
-
-        return 0;
-    }
-
-    private static int Compute(int x, int y)
-    {
-        return x + y;
-    }
-
-    public static int Main(string[] argv)
-    {
-        int result;
-
-        result = TestLoadArguments(10, 20, 30, 40);
-        if (result != 0) return 100 + result;
-
-        result = TestLocalVariables();
-        if (result != 0) return 200 + result;
-
-        result = TestPop();
-        if (result != 0) return 300 + result;
-
-        result = TestDup();
-        if (result != 0) return 400 + result;
-
-        result = TestReturn();
-        if (result != 0) return 500 + result;
-
-        result = TestStackCombinations();
-        if (result != 0) return 600 + result;
-
-        return 0;
-    }
-}

WoofWare.PawPrint/AbstractMachine.fs

@@ -42,7 +42,7 @@ module AbstractMachine =
                 | Some {
                            WasConstructingObj = Some _
                        } ->
-                    IlMachineState.executeDelegateConstructor baseClassTypes instruction state
+                    IlMachineState.executeDelegateConstructor instruction state
                     // can't advance the program counter here - there's no IL instructions executing!
                     |> IlMachineState.returnStackFrame loggerFactory baseClassTypes thread
                     |> Option.get
@@ -54,7 +54,7 @@ module AbstractMachine =
                     // We've been instructed to run a delegate.
                     let delegateToRunAddr =
                         match instruction.Arguments.[0] with
-                        | CliType.RuntimePointer (CliRuntimePointer.Managed (ManagedPointerSource.Heap addr))
+                        | CliType.RuntimePointer (CliRuntimePointer.Managed (CliRuntimePointerSource.Heap addr))
                         | CliType.ObjectRef (Some addr) -> addr
                         | _ -> failwith "expected a managed object ref to delegate"
 

WoofWare.PawPrint/BasicCliType.fs

@@ -1,9 +1,8 @@
 namespace WoofWare.PawPrint
 
-open System
 open System.Collections.Immutable
 open System.Reflection
-open Checked
+open System.Reflection.Metadata
 
 /// Source:
 /// Table I.6: Data Types Directly Supported by the CLI
@@ -44,7 +43,6 @@ type ManagedPointerSource =
     | ArrayIndex of arr : ManagedHeapAddress * index : int
     | Field of ManagedPointerSource * fieldName : string
     | Null
-    | InterpretedAsType of ManagedPointerSource * ConcreteType<ConcreteTypeHandle>
 
     override this.ToString () =
         match this with
@@ -56,7 +54,6 @@ type ManagedPointerSource =
             $"<argument %i{var} in method frame %i{method} of thread %O{source}>"
         | ManagedPointerSource.ArrayIndex (arr, index) -> $"<index %i{index} of array %O{arr}>"
         | ManagedPointerSource.Field (source, name) -> $"<field %s{name} of %O{source}>"
-        | ManagedPointerSource.InterpretedAsType (src, ty) -> $"<%O{src} as %s{ty.Namespace}.%s{ty.Name}>"
 
 [<RequireQualifiedAccess>]
 type UnsignedNativeIntSource =
@@ -69,7 +66,6 @@ type NativeIntSource =
     | ManagedPointer of ManagedPointerSource
     | FunctionPointer of MethodInfo<ConcreteTypeHandle, ConcreteTypeHandle, ConcreteTypeHandle>
     | TypeHandlePtr of ConcreteTypeHandle
-    | FieldHandlePtr of int64
 
     override this.ToString () : string =
         match this with
@@ -78,14 +74,12 @@ type NativeIntSource =
         | NativeIntSource.FunctionPointer methodDefinition ->
             $"<pointer to {methodDefinition.Name} in {methodDefinition.DeclaringType.Assembly.Name}>"
         | NativeIntSource.TypeHandlePtr ptr -> $"<type ID %O{ptr}>"
-        | NativeIntSource.FieldHandlePtr ptr -> $"<field ID %O{ptr}>"
 
 [<RequireQualifiedAccess>]
 module NativeIntSource =
     let isZero (n : NativeIntSource) : bool =
         match n with
         | NativeIntSource.Verbatim i -> i = 0L
-        | NativeIntSource.FieldHandlePtr _
         | NativeIntSource.TypeHandlePtr _ -> false
         | NativeIntSource.FunctionPointer _ -> failwith "TODO"
         | NativeIntSource.ManagedPointer src ->
@@ -97,7 +91,6 @@ module NativeIntSource =
         match n with
         | NativeIntSource.Verbatim i -> i >= 0L
         | NativeIntSource.FunctionPointer _ -> failwith "TODO"
-        | NativeIntSource.FieldHandlePtr _
         | NativeIntSource.TypeHandlePtr _ -> true
         | NativeIntSource.ManagedPointer _ -> true
 
@@ -122,51 +115,46 @@ type CliNumericType =
     | Float32 of float32
     | Float64 of float
 
-    static member SizeOf (t : CliNumericType) : int =
-        match t with
-        | CliNumericType.Int32 _ -> 4
-        | CliNumericType.Int64 _ -> 8
-        | CliNumericType.NativeInt _ -> 8
-        | CliNumericType.NativeFloat _ -> 8
-        | CliNumericType.Int8 _ -> 1
-        | CliNumericType.Int16 _ -> 2
-        | CliNumericType.UInt8 _ -> 1
-        | CliNumericType.UInt16 _ -> 2
-        | CliNumericType.Float32 _ -> 4
-        | CliNumericType.Float64 _ -> 8
+[<RequireQualifiedAccess>]
+type CliRuntimePointerSource =
+    | LocalVariable of sourceThread : ThreadId * methodFrame : int * whichVar : uint16
+    | Argument of sourceThread : ThreadId * methodFrame : int * whichVar : uint16
+    | Field of source : CliRuntimePointerSource * fieldName : string
+    | Heap of ManagedHeapAddress
+    | ArrayIndex of arr : ManagedHeapAddress * index : int
+    | Null
 
-    static member ToBytes (t : CliNumericType) : byte[] =
-        match t with
-        | CliNumericType.Int32 i -> BitConverter.GetBytes i
-        | CliNumericType.Int64 i -> BitConverter.GetBytes i
-        | CliNumericType.NativeInt src ->
-            match src with
-            | NativeIntSource.Verbatim i -> BitConverter.GetBytes i
-            | NativeIntSource.ManagedPointer src ->
-                match src with
-                | ManagedPointerSource.Null -> BitConverter.GetBytes 0L
-                | _ -> failwith "refusing to express pointer as bytes"
-            | NativeIntSource.FieldHandlePtr _ -> failwith "refusing to express FieldHandlePtr as bytes"
-            | NativeIntSource.FunctionPointer _ -> failwith "refusing to express FunctionPointer as bytes"
-            | NativeIntSource.TypeHandlePtr _ -> failwith "refusing to express TypeHandlePtr as bytes"
-        | CliNumericType.NativeFloat f -> BitConverter.GetBytes f
-        | CliNumericType.Int8 i -> BitConverter.GetBytes i
-        | CliNumericType.Int16 i -> BitConverter.GetBytes i
-        | CliNumericType.UInt8 i -> BitConverter.GetBytes i
-        | CliNumericType.UInt16 i -> BitConverter.GetBytes i
-        | CliNumericType.Float32 i -> BitConverter.GetBytes i
-        | CliNumericType.Float64 i -> BitConverter.GetBytes i
+[<RequireQualifiedAccess>]
+module CliRuntimePointerSource =
+    let rec ofManagedPointerSource (ptrSource : ManagedPointerSource) : CliRuntimePointerSource =
+        match ptrSource with
+        | ManagedPointerSource.LocalVariable (sourceThread, methodFrame, whichVar) ->
+            CliRuntimePointerSource.LocalVariable (sourceThread, methodFrame, whichVar)
+        | ManagedPointerSource.Argument (sourceThread, methodFrame, whichVar) ->
+            CliRuntimePointerSource.Argument (sourceThread, methodFrame, whichVar)
+        | ManagedPointerSource.Heap managedHeapAddress -> CliRuntimePointerSource.Heap managedHeapAddress
+        | ManagedPointerSource.Null -> CliRuntimePointerSource.Null
+        | ManagedPointerSource.ArrayIndex (arr, ind) -> CliRuntimePointerSource.ArrayIndex (arr, ind)
+        | ManagedPointerSource.Field (a, ind) ->
+            let a = ofManagedPointerSource a
+            CliRuntimePointerSource.Field (a, ind)
+
+    let rec toManagedPointerSource (ptrSource : CliRuntimePointerSource) : ManagedPointerSource =
+        match ptrSource with
+        | CliRuntimePointerSource.LocalVariable (sourceThread, methodFrame, whichVar) ->
+            ManagedPointerSource.LocalVariable (sourceThread, methodFrame, whichVar)
+        | CliRuntimePointerSource.Argument (sourceThread, methodFrame, whichVar) ->
+            ManagedPointerSource.Argument (sourceThread, methodFrame, whichVar)
+        | CliRuntimePointerSource.Heap managedHeapAddress -> ManagedPointerSource.Heap managedHeapAddress
+        | CliRuntimePointerSource.Null -> ManagedPointerSource.Null
+        | CliRuntimePointerSource.ArrayIndex (arr, ind) -> ManagedPointerSource.ArrayIndex (arr, ind)
+        | CliRuntimePointerSource.Field (a, ind) ->
+            let a = toManagedPointerSource a
+            ManagedPointerSource.Field (a, ind)
 
 type CliRuntimePointer =
-    | Verbatim of int64
-    | FieldRegistryHandle of int64
-    | Managed of ManagedPointerSource
-
-type SizeofResult =
-    {
-        Alignment : int
-        Size : int
-    }
+    | Unmanaged of int64
+    | Managed of CliRuntimePointerSource
 
 /// This is the kind of type that can be stored in arguments, local variables, statics, array elements, fields.
 type CliType =
@@ -184,349 +172,27 @@ type CliType =
     /// as a concatenated list of its fields.
     | ValueType of CliValueType
 
-    static member SizeOf (t : CliType) : SizeofResult =
-        match t with
-        | CliType.Numeric ty ->
-            let size = CliNumericType.SizeOf ty
-
-            {
-                Size = size
-                Alignment = size
-            }
-        | CliType.Bool _ ->
-            {
-                Size = 1
-                Alignment = 1
-            }
-        | CliType.Char _ ->
-            {
-                Size = 2
-                Alignment = 2
-            }
-        | CliType.ObjectRef _ ->
-            {
-                Size = 8
-                Alignment = 8
-            }
-        | CliType.RuntimePointer _ ->
-            {
-                Size = 8
-                Alignment = 8
-            }
-        | CliType.ValueType vt -> CliValueType.SizeOf vt
-
-    static member ToBytes (t : CliType) : byte[] =
-        match t with
-        | CliType.Numeric n -> CliNumericType.ToBytes n
-        | CliType.Bool b -> [| b |]
-        | CliType.Char (high, low) -> [| low ; high |]
-        | CliType.ObjectRef None -> Array.zeroCreate NATIVE_INT_SIZE
-        | CliType.ObjectRef (Some i) -> failwith "todo"
-        | CliType.RuntimePointer cliRuntimePointer -> failwith "todo"
-        | CliType.ValueType cvt -> CliValueType.ToBytes cvt
-
-    static member OfBytesAsType (targetType : ConcreteTypeHandle) (bytes : byte[]) : CliType = failwith "TODO"
-
 and CliField =
     {
         Name : string
         Contents : CliType
         /// "None" for "no explicit offset specified"; we expect most offsets to be None.
         Offset : int option
-        Type : ConcreteTypeHandle
     }
 
-and CliConcreteField =
-    private
-        {
-            Name : string
-            Contents : CliType
-            Offset : int
-            Size : int
-            Alignment : int
-            ConfiguredOffset : int option
-            EditedAtTime : uint64
-            Type : ConcreteTypeHandle
-        }
-
-    static member ToCliField (this : CliConcreteField) : CliField =
-        {
-            Offset = this.ConfiguredOffset
-            Contents = this.Contents
-            Name = this.Name
-            Type = this.Type
-        }
-
 and CliValueType =
-    private
+    {
+        Fields : CliField list
+    }
+
+    static member OfFields (f : CliField list) =
         {
-            _Fields : CliConcreteField list
-            Layout : Layout
-            /// We track dependency orderings between updates to overlapping fields with a monotonically increasing
-            /// timestamp.
-            NextTimestamp : uint64
+            Fields = f
         }
 
-    static member private ComputeConcreteFields (layout : Layout) (fields : CliField list) : CliConcreteField list =
-        // Minimum size only matters for `sizeof` computation
-        let _minimumSize, packingSize =
-            match layout with
-            | Layout.Custom (size = size ; packingSize = packing) ->
-                size, if packing = 0 then DEFAULT_STRUCT_ALIGNMENT else packing
-            | Layout.Default -> 0, DEFAULT_STRUCT_ALIGNMENT
-
-        let seqFields, nonSeqFields =
-            fields |> List.partition (fun field -> field.Offset.IsNone)
-
-        match seqFields, nonSeqFields with
-        | [], [] -> []
-        | _ :: _, [] ->
-            // Sequential layout: compute offsets respecting alignment
-            let _, concreteFields =
-                ((0, []), seqFields)
-                ||> List.fold (fun (currentOffset, acc) field ->
-                    let size = CliType.SizeOf field.Contents
-                    let alignmentCap = min size.Alignment packingSize
-                    let error = currentOffset % alignmentCap
-
-                    let alignedOffset =
-                        if error > 0 then
-                            currentOffset + (alignmentCap - error)
-                        else
-                            currentOffset
-
-                    let concreteField =
-                        {
-                            Name = field.Name
-                            Contents = field.Contents
-                            Offset = alignedOffset
-                            Size = size.Size
-                            Alignment = size.Alignment
-                            ConfiguredOffset = field.Offset
-                            EditedAtTime = 0UL
-                            Type = field.Type
-                        }
-
-                    alignedOffset + size.Size, concreteField :: acc
-                )
-
-            List.rev concreteFields
-
-        | [], _ :: _ ->
-            // Explicit layout: use provided offsets
-            nonSeqFields
-            |> List.map (fun field ->
-                let size = CliType.SizeOf field.Contents
-
-                {
-                    Name = field.Name
-                    Contents = field.Contents
-                    Offset = field.Offset.Value
-                    Size = size.Size
-                    Alignment = size.Alignment
-                    ConfiguredOffset = field.Offset
-                    EditedAtTime = 0UL
-                    Type = field.Type
-                }
-            )
-
-        | _ :: _, _ :: _ -> failwith "unexpectedly mixed explicit and automatic layout of fields"
-
-    static member ToBytes (cvt : CliValueType) : byte[] =
-        let bytes = Array.zeroCreate<byte> (CliValueType.SizeOf(cvt).Size)
-
-        cvt._Fields
-        |> List.sortBy _.EditedAtTime
-        |> List.iter (fun candidateField ->
-            let fieldBytes : byte[] = CliType.ToBytes candidateField.Contents
-
-            for i = 0 to candidateField.Size - 1 do
-                bytes.[candidateField.Offset + i] <- fieldBytes.[i]
-        )
-
-        bytes
-
-    static member OfFields (layout : Layout) (f : CliField list) : CliValueType =
-        let fields = CliValueType.ComputeConcreteFields layout f
-
-        {
-            _Fields = fields
-            Layout = layout
-            NextTimestamp = 1UL
-        }
-
-    static member AddField (f : CliField) (vt : CliValueType) : CliValueType =
-        // Recompute all fields with the new one added
-        // TODO: the existence of this function at all is rather dubious, but it's there
-        // at the moment to support delegate types.
-        // The whole function is just a bodge and it will hopefully go away soon; I just don't know how.
-        let prevFields = vt._Fields |> List.map (fun f -> f.Name, f) |> Map.ofList
-
-        let allFields =
-            f
-            :: (vt._Fields
-                |> List.map (fun cf ->
-                    {
-                        Name = cf.Name
-                        Contents = cf.Contents
-                        Offset =
-                            match vt.Layout with
-                            | Layout.Default -> None
-                            | Layout.Custom _ -> Some cf.Offset
-                        Type = cf.Type
-                    }
-                ))
-
-        let newFields =
-            CliValueType.ComputeConcreteFields vt.Layout allFields
-            |> List.map (fun field ->
-                match Map.tryFind field.Name prevFields with
-                | Some prev ->
-                    { field with
-                        EditedAtTime = prev.EditedAtTime
-                    }
-                | None ->
-                    { field with
-                        EditedAtTime = vt.NextTimestamp
-                    }
-            )
-
-        {
-            _Fields = newFields
-            Layout = vt.Layout
-            NextTimestamp = vt.NextTimestamp + 1UL
-        }
-
-    /// Returns the offset and size.
-    static member GetFieldLayout (field : string) (cvt : CliValueType) : int * int =
-        let targetField =
-            cvt._Fields
-            |> List.tryFind (fun f -> f.Name = field)
-            |> Option.defaultWith (fun () -> failwithf $"Field '%s{field}' not found")
-
-        targetField.Offset, targetField.Size
-
-    // TODO: use DereferenceFieldAt for the implementation.
-    // We should eventually be able to dereference an arbitrary field of a struct
-    // as though it were any other field of any other type, to accommodate Unsafe.As.
-    static member DereferenceField (field : string) (cvt : CliValueType) : CliType =
-        let targetField =
-            cvt._Fields
-            |> List.tryFind (fun f -> f.Name = field)
-            |> Option.defaultWith (fun () -> failwithf $"Field '%s{field}' not found")
-
-        // Identify all fields that overlap with the target field's memory range
-        let targetStart = targetField.Offset
-        let targetEnd = targetField.Offset + targetField.Size
-
-        let affectedFields =
-            cvt._Fields
-            |> List.filter (fun f ->
-                let fieldStart = f.Offset
-                let fieldEnd = f.Offset + f.Size
-                // Fields overlap if their ranges intersect
-                fieldStart < targetEnd && targetStart < fieldEnd
-            )
-
-        match affectedFields with
-        | [] -> failwith "unexpectedly didn't dereference a field"
-        | [ f ] -> f.Contents
-        | fields ->
-            let bytes = CliValueType.ToBytes cvt
-
-            let fieldBytes =
-                bytes.[targetField.Offset .. targetField.Offset + targetField.Size - 1]
-
-            CliType.OfBytesAsType targetField.Type fieldBytes
-
-    static member FieldsAt (offset : int) (cvt : CliValueType) : CliConcreteField list =
-        cvt._Fields |> List.filter (fun f -> f.Offset = offset)
-
-    static member DereferenceFieldAt (offset : int) (size : int) (cvt : CliValueType) : CliType =
-        let targetField =
-            CliValueType.FieldsAt offset cvt |> List.tryFind (fun f -> f.Size = size)
-
-        match targetField with
-        | None -> failwith "TODO: couldn't find the field"
-        | Some f -> f.Contents
-
-    static member SizeOf (vt : CliValueType) : SizeofResult =
-        let minimumSize, packingSize =
-            match vt.Layout with
-            | Layout.Custom (size = size ; packingSize = packing) ->
-                size, if packing = 0 then DEFAULT_STRUCT_ALIGNMENT else packing
-            | Layout.Default -> 0, DEFAULT_STRUCT_ALIGNMENT
-
-        if vt._Fields.IsEmpty then
-            {
-                Size = minimumSize
-                Alignment = 1
-            }
-        else
-            // Now we can just use the precomputed offsets and sizes
-            let finalOffset, alignment =
-                vt._Fields
-                |> List.fold
-                    (fun (maxEnd, maxAlign) field ->
-                        let fieldEnd = field.Offset + field.Size
-                        let alignmentCap = min field.Alignment packingSize
-                        max maxEnd fieldEnd, max maxAlign alignmentCap
-                    )
-                    (0, 0)
-
-            let error = finalOffset % alignment
-
-            let size =
-                if error = 0 then
-                    finalOffset
-                else
-                    finalOffset + (alignment - error)
-
-            {
-                Size = max size minimumSize
-                Alignment = alignment
-            }
-
-    /// Sets the value of the specified field, *without* touching any overlapping fields.
-    /// `DereferenceField` handles resolving conflicts between overlapping fields.
-    static member WithFieldSet (field : string) (value : CliType) (cvt : CliValueType) : CliValueType =
-        {
-            Layout = cvt.Layout
-            _Fields =
-                cvt._Fields
-                |> List.replaceWhere (fun f ->
-                    if f.Name = field then
-                        { f with
-                            Contents = value
-                            EditedAtTime = cvt.NextTimestamp
-                        }
-                        |> Some
-                    else
-                        None
-                )
-            NextTimestamp = cvt.NextTimestamp + 1UL
-        }
-
-    /// To facilitate bodges. This function absolutely should not exist.
-    static member TryExactlyOneField (cvt : CliValueType) : CliField option =
-        match cvt._Fields with
-        | [] -> None
-        | [ x ] ->
-            if x.Offset = 0 then
-                Some (CliConcreteField.ToCliField x)
-            else
-                None
-        | _ -> None
-
-    /// To facilitate bodges. This function absolutely should not exist.
-    static member TrySequentialFields (cvt : CliValueType) : CliField list option =
-        let isNone, isSome =
-            cvt._Fields |> List.partition (fun field -> field.ConfiguredOffset.IsNone)
-
-        match isSome with
-        | [] -> Some (isNone |> List.map CliConcreteField.ToCliField)
-        | [ field ] when field.ConfiguredOffset = Some 0 -> Some [ CliConcreteField.ToCliField field ]
-        | _ -> None
+    static member DereferenceField (name : string) (f : CliValueType) : CliType =
+        // TODO: this is wrong, it doesn't account for overlapping fields
+        f.Fields |> List.find (fun f -> f.Name = name) |> _.Contents
 
 type CliTypeResolutionResult =
     | Resolved of CliType
@@ -542,14 +208,33 @@ module CliType =
 
     let ofManagedObject (ptr : ManagedHeapAddress) : CliType = CliType.ObjectRef (Some ptr)
 
-    let sizeOf (ty : CliType) : int = CliType.SizeOf(ty).Size
+    let rec sizeOf (ty : CliType) : int =
+        match ty with
+        | CliType.Numeric ty ->
+            match ty with
+            | CliNumericType.Int32 _ -> 4
+            | CliNumericType.Int64 _ -> 8
+            | CliNumericType.NativeInt _ -> 8
+            | CliNumericType.NativeFloat _ -> 8
+            | CliNumericType.Int8 _ -> 1
+            | CliNumericType.Int16 _ -> 2
+            | CliNumericType.UInt8 _ -> 1
+            | CliNumericType.UInt16 _ -> 2
+            | CliNumericType.Float32 _ -> 4
+            | CliNumericType.Float64 _ -> 8
+        | CliType.Bool _ -> 1
+        | CliType.Char _ -> 2
+        | CliType.ObjectRef _ -> 8
+        | CliType.RuntimePointer _ -> 8
+        | CliType.ValueType vt ->
+            match vt.Fields with
+            | [] -> failwith "is it even possible to instantiate a value type with no fields"
+            | [ field ] -> sizeOf field.Contents
+            | fields ->
+                // TODO: consider struct layout (there's an `Explicit` test that will exercise that)
+                fields |> List.map (_.Contents >> sizeOf) |> List.sum
 
-    let zeroOfPrimitive
-        (concreteTypes : AllConcreteTypes)
-        (corelib : BaseClassTypes<DumpedAssembly>)
-        (primitiveType : PrimitiveType)
-        : CliType
-        =
+    let zeroOfPrimitive (primitiveType : PrimitiveType) : CliType =
         match primitiveType with
         | PrimitiveType.Boolean -> CliType.Bool 0uy
         | PrimitiveType.Char -> CliType.Char (0uy, 0uy)
@@ -572,36 +257,20 @@ module CliType =
         | PrimitiveType.IntPtr ->
             {
                 Name = "_value"
-                Contents =
-                    CliType.Numeric (
-                        CliNumericType.NativeInt (NativeIntSource.ManagedPointer ManagedPointerSource.Null)
-                    )
-                Offset = None
-                Type =
-                    AllConcreteTypes.findExistingConcreteType
-                        concreteTypes
-                        (corelib.IntPtr.Assembly, corelib.IntPtr.Namespace, corelib.IntPtr.Name, ImmutableArray.Empty)
-                    |> Option.get
+                Contents = CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null)
+                Offset = Some 0
             }
             |> List.singleton
-            |> CliValueType.OfFields Layout.Default
+            |> CliValueType.OfFields
             |> CliType.ValueType
         | PrimitiveType.UIntPtr ->
             {
                 Name = "_value"
-                Contents =
-                    CliType.Numeric (
-                        CliNumericType.NativeInt (NativeIntSource.ManagedPointer ManagedPointerSource.Null)
-                    )
-                Offset = None
-                Type =
-                    AllConcreteTypes.findExistingConcreteType
-                        concreteTypes
-                        (corelib.UIntPtr.Assembly, corelib.UIntPtr.Namespace, corelib.UIntPtr.Name, ImmutableArray.Empty)
-                    |> Option.get
+                Contents = CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null)
+                Offset = Some 0
             }
             |> List.singleton
-            |> CliValueType.OfFields Layout.Default
+            |> CliValueType.OfFields
             |> CliType.ValueType
         | PrimitiveType.Object -> CliType.ObjectRef None
 
@@ -627,11 +296,11 @@ module CliType =
         match handle with
         | ConcreteTypeHandle.Byref _ ->
             // Byref types are managed references - the zero value is a null reference
-            CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null), concreteTypes
+            CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null), concreteTypes
 
         | ConcreteTypeHandle.Pointer _ ->
             // Pointer types are unmanaged pointers - the zero value is a null pointer
-            CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null), concreteTypes
+            CliType.RuntimePointer (CliRuntimePointer.Unmanaged 0L), concreteTypes
 
         | ConcreteTypeHandle.Concrete _ ->
             // This is a concrete type - look it up in the mapping
@@ -645,82 +314,72 @@ module CliType =
             let typeDef = assembly.TypeDefs.[concreteType.Definition.Get]
 
             // Check if it's a primitive type by comparing with corelib types FIRST
-            if
-                concreteType.Assembly.FullName = corelib.Corelib.Name.FullName
-                && concreteType.Generics.IsEmpty
-            then
+            if concreteType.Assembly = corelib.Corelib.Name && concreteType.Generics.IsEmpty then
                 // Check against known primitive types
                 if TypeInfo.NominallyEqual typeDef corelib.Boolean then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Boolean, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Boolean, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Char then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Char, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Char, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.SByte then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.SByte, concreteTypes
+                    zeroOfPrimitive PrimitiveType.SByte, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Byte then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Byte, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Byte, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Int16 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Int16, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Int16, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.UInt16 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.UInt16, concreteTypes
+                    zeroOfPrimitive PrimitiveType.UInt16, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Int32 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Int32, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Int32, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.UInt32 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.UInt32, concreteTypes
+                    zeroOfPrimitive PrimitiveType.UInt32, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Int64 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Int64, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Int64, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.UInt64 then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.UInt64, concreteTypes
+                    zeroOfPrimitive PrimitiveType.UInt64, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Single then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Single, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Single, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Double then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Double, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Double, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.String then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.String, concreteTypes
+                    zeroOfPrimitive PrimitiveType.String, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.Object then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.Object, concreteTypes
+                    zeroOfPrimitive PrimitiveType.Object, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.IntPtr then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.IntPtr, concreteTypes
+                    zeroOfPrimitive PrimitiveType.IntPtr, concreteTypes
                 elif TypeInfo.NominallyEqual typeDef corelib.UIntPtr then
-                    zeroOfPrimitive concreteTypes corelib PrimitiveType.UIntPtr, concreteTypes
-                elif TypeInfo.NominallyEqual typeDef corelib.Array then
-                    // Arrays are reference types
-                    CliType.ObjectRef None, concreteTypes
+                    zeroOfPrimitive PrimitiveType.UIntPtr, concreteTypes
+                else if
+                    // Check if it's an array type
+                    typeDef = corelib.Array
+                then
+                    CliType.ObjectRef None, concreteTypes // Arrays are reference types
                 else if
-
                     // Not a known primitive, now check for cycles
                     Set.contains handle visited
                 then
                     // We're in a cycle - return a default zero value for the type
-                    // Value types can't be self-referential unless they are specifically known to the
-                    // runtime - for example, System.Byte is a value type with a single field,
-                    // of type System.Byte.
-                    // Since we check for (nominal) equality against all such types in the first branch,
-                    // this code path is only hit with reference types.
+                    // For value types in cycles, we'll return a null reference as a safe fallback
+                    // This should only happen with self-referential types
                     CliType.ObjectRef None, concreteTypes
                 else
                     let visited = Set.add handle visited
                     // Not a known primitive, check if it's a value type or reference type
                     determineZeroForCustomType concreteTypes assemblies corelib handle concreteType typeDef visited
             else if
-
                 // Not from corelib or has generics
                 concreteType.Assembly = corelib.Corelib.Name
                 && typeDef = corelib.Array
                 && concreteType.Generics.Length = 1
             then
-                // This is an array type, so null is appropriate
+                // This is an array type
                 CliType.ObjectRef None, concreteTypes
             else if
-
                 // Custom type - now check for cycles
                 Set.contains handle visited
             then
-                // We're in a cycle - return a default zero value for the type.
-                // Value types can't be self-referential unless they are specifically known to the
-                // runtime - for example, System.Byte is a value type with a single field,
-                // of type System.Byte.
-                // Since we check for (nominal) equality against all such types in the first branch,
-                // this code path is only hit with reference types.
+                // We're in a cycle - return a default zero value for the type
+                // For value types in cycles, we'll return a null reference as a safe fallback
+                // This should only happen with self-referential types
                 CliType.ObjectRef None, concreteTypes
             else
                 let visited = Set.add handle visited
@@ -771,10 +430,9 @@ module CliType =
                         Name = field.Name
                         Contents = fieldZero
                         Offset = field.Offset
-                        Type = fieldHandle
                     }
                 )
-                |> CliValueType.OfFields typeDef.Layout
+                |> CliValueType.OfFields
 
             CliType.ValueType vt, currentConcreteTypes
         else
@@ -837,7 +495,21 @@ module CliType =
         | CliType.Char (high, low) -> failwith "todo"
         | CliType.ObjectRef managedHeapAddressOption -> failwith "todo"
         | CliType.RuntimePointer cliRuntimePointer -> failwith "todo"
-        | CliType.ValueType cvt -> CliValueType.WithFieldSet field value cvt |> CliType.ValueType
+        | CliType.ValueType cvt ->
+            {
+                Fields =
+                    cvt.Fields
+                    |> List.replaceWhere (fun f ->
+                        if f.Name = field then
+                            { f with
+                                Contents = value
+                            }
+                            |> Some
+                        else
+                            None
+                    )
+            }
+            |> CliType.ValueType
 
     let getField (field : string) (value : CliType) : CliType =
         match value with
@@ -846,24 +518,6 @@ module CliType =
         | CliType.Char (high, low) -> failwith "todo"
         | CliType.ObjectRef managedHeapAddressOption -> failwith "todo"
         | CliType.RuntimePointer cliRuntimePointer -> failwith "todo"
-        | CliType.ValueType cvt -> CliValueType.DereferenceField field cvt
-
-    /// Returns the offset and size.
-    let getFieldLayout (field : string) (value : CliType) : int * int =
-        match value with
-        | CliType.Numeric cliNumericType -> failwith "todo"
-        | CliType.Bool b -> failwith "todo"
-        | CliType.Char (high, low) -> failwith "todo"
-        | CliType.ObjectRef managedHeapAddressOption -> failwith "todo"
-        | CliType.RuntimePointer cliRuntimePointer -> failwith "todo"
-        | CliType.ValueType cvt -> CliValueType.GetFieldLayout field cvt
-
-    /// Returns None if there isn't *exactly* one field that starts there. This rules out some valid programs.
-    let getFieldAt (offset : int) (value : CliType) : CliConcreteField option =
-        match value with
-        | CliType.Numeric cliNumericType -> failwith "todo"
-        | CliType.Bool b -> failwith "todo"
-        | CliType.Char (high, low) -> failwith "todo"
-        | CliType.ObjectRef managedHeapAddressOption -> failwith "todo"
-        | CliType.RuntimePointer cliRuntimePointer -> failwith "todo"
-        | CliType.ValueType cvt -> CliValueType.FieldsAt offset cvt |> List.tryExactlyOne
+        | CliType.ValueType cvt ->
+            cvt.Fields
+            |> List.pick (fun f -> if f.Name = field then Some f.Contents else None)

WoofWare.PawPrint/BinaryArithmetic.fs

@@ -4,133 +4,25 @@ namespace WoofWare.PawPrint
 
 type IArithmeticOperation =
     abstract Int32Int32 : int32 -> int32 -> int32
-    abstract Int32NativeInt : int32 -> nativeint -> nativeint
-    abstract NativeIntInt32 : nativeint -> int32 -> nativeint
     abstract Int64Int64 : int64 -> int64 -> int64
     abstract FloatFloat : float -> float -> float
-    abstract NativeIntNativeInt : nativeint -> nativeint -> nativeint
-    abstract Int32ManagedPtr : IlMachineState -> int32 -> ManagedPointerSource -> Choice<ManagedPointerSource, int>
-    abstract ManagedPtrInt32 : IlMachineState -> ManagedPointerSource -> int32 -> Choice<ManagedPointerSource, int>
-
-    abstract ManagedPtrManagedPtr :
-        IlMachineState -> ManagedPointerSource -> ManagedPointerSource -> Choice<ManagedPointerSource, nativeint>
-
     abstract Name : string
 
 [<RequireQualifiedAccess>]
 module ArithmeticOperation =
-    let private addInt32ManagedPtr state v ptr =
-        match ptr with
-        | LocalVariable (sourceThread, methodFrame, whichVar) -> failwith "refusing to add to a local variable address"
-        | Argument (sourceThread, methodFrame, whichVar) -> failwith "refusing to add to an argument address"
-        | Heap managedHeapAddress -> failwith "refusing to add to a heap address"
-        | ArrayIndex (arr, index) -> failwith "TODO: arrays"
-        | Field (src, fieldName) ->
-            let obj = IlMachineState.dereferencePointer state src
-            let offset, _ = CliType.getFieldLayout fieldName obj
-
-            match CliType.getFieldAt (offset + v) obj with
-            | None -> failwith "TODO: couldn't identify field at offset"
-            | Some field ->
-                ManagedPointerSource.Field (src, CliConcreteField.ToCliField(field).Name)
-                |> Choice1Of2
-        | Null -> Choice2Of2 v
-        | InterpretedAsType (managedPointerSource, concreteType) -> failwith "todo"
-
-    let private mulInt32ManagedPtr (state : IlMachineState) v ptr =
-        if v = 0 then
-            Choice2Of2 0
-        elif v = 1 then
-            Choice1Of2 ptr
-        else
-
-        match ptr with
-        | ManagedPointerSource.Null -> Choice2Of2 0
-        | _ -> failwith "refusing to multiply pointers"
-
     let add =
         { new IArithmeticOperation with
             member _.Int32Int32 a b = (# "add" a b : int32 #)
             member _.Int64Int64 a b = (# "add" a b : int64 #)
             member _.FloatFloat a b = (# "add" a b : float #)
-            member _.NativeIntNativeInt a b = (# "add" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "add" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "add" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ManagedPointerSource.Null, _ -> Choice1Of2 ptr2
-                | _, ManagedPointerSource.Null -> Choice1Of2 ptr1
-                | _, _ -> failwith "refusing to add two managed pointers"
-
-            member _.Int32ManagedPtr state val1 ptr2 = addInt32ManagedPtr state val1 ptr2
-            member _.ManagedPtrInt32 state ptr1 val2 = addInt32ManagedPtr state val2 ptr1
-
             member _.Name = "add"
         }
 
-    let addOvf =
-        { new IArithmeticOperation with
-            member _.Int32Int32 a b = (# "add.ovf" a b : int32 #)
-            member _.Int64Int64 a b = (# "add.ovf" a b : int64 #)
-            member _.FloatFloat a b = (# "add.ovf" a b : float #)
-            member _.NativeIntNativeInt a b = (# "add.ovf" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "add.ovf" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "add.ovf" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ManagedPointerSource.Null, _ -> Choice1Of2 ptr2
-                | _, ManagedPointerSource.Null -> Choice1Of2 ptr1
-                | _, _ -> failwith "refusing to add two managed pointers"
-
-            member _.Int32ManagedPtr state val1 ptr2 = addInt32ManagedPtr state val1 ptr2
-            member _.ManagedPtrInt32 state ptr1 val2 = addInt32ManagedPtr state val2 ptr1
-
-            member _.Name = "add.ovf"
-        }
-
     let sub =
         { new IArithmeticOperation with
             member _.Int32Int32 a b = (# "sub" a b : int32 #)
             member _.Int64Int64 a b = (# "sub" a b : int64 #)
             member _.FloatFloat a b = (# "sub" a b : float #)
-            member _.NativeIntNativeInt a b = (# "sub" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "sub" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "sub" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr state ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ptr1, ManagedPointerSource.Null -> Choice1Of2 ptr1
-                | ManagedPointerSource.Null, _ -> failwith "refusing to create negative pointer"
-                | ManagedPointerSource.ArrayIndex (arr1, index1), ManagedPointerSource.ArrayIndex (arr2, index2) ->
-                    if arr1 <> arr2 then
-                        failwith "refusing to operate on pointers to different arrays"
-
-                    (index1 - index2) |> nativeint |> Choice2Of2
-                | ManagedPointerSource.ArrayIndex _, _ -> failwith $"refusing to operate on array index ptr vs %O{ptr2}"
-                | ManagedPointerSource.Argument _, _
-                | _, ManagedPointerSource.Argument _ ->
-                    failwith $"refusing to operate on pointers to arguments: %O{ptr1} and %O{ptr2}"
-                | ManagedPointerSource.Field (obj1, fieldName1), ManagedPointerSource.Field (obj2, fieldName2) ->
-                    if obj1 <> obj2 then
-                        failwith "refusing to operate on field pointers in different objects"
-
-                    let obj = IlMachineState.dereferencePointer state obj1
-
-                    let offset1, _ = CliType.getFieldLayout fieldName1 obj
-                    let offset2, _ = CliType.getFieldLayout fieldName2 obj
-
-                    (offset1 - offset2) |> nativeint |> Choice2Of2
-                | _, _ -> failwith "TODO"
-
-            member _.Int32ManagedPtr state val1 ptr2 =
-                match ptr2 with
-                | ManagedPointerSource.Null -> Choice2Of2 val1
-                | _ -> failwith "refusing to subtract a pointer"
-
-            member _.ManagedPtrInt32 state ptr1 val2 = failwith "TODO: subtract from pointer"
-
             member _.Name = "sub"
         }
 
@@ -139,143 +31,21 @@ module ArithmeticOperation =
             member _.Int32Int32 a b = (# "mul" a b : int32 #)
             member _.Int64Int64 a b = (# "mul" a b : int64 #)
             member _.FloatFloat a b = (# "mul" a b : float #)
-            member _.NativeIntNativeInt a b = (# "mul" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "mul" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "mul" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ManagedPointerSource.Null, _ -> Choice2Of2 (nativeint 0)
-                | _, ManagedPointerSource.Null -> Choice2Of2 (nativeint 0)
-                | _, _ -> failwith "refusing to multiply two managed pointers"
-
-            member _.Int32ManagedPtr state a ptr = mulInt32ManagedPtr state a ptr
-            member _.ManagedPtrInt32 state ptr a = mulInt32ManagedPtr state a ptr
-
             member _.Name = "mul"
         }
 
-    let rem =
-        { new IArithmeticOperation with
-            member _.Int32Int32 a b = (# "rem" a b : int32 #)
-            member _.Int64Int64 a b = (# "rem" a b : int64 #)
-            member _.FloatFloat a b = (# "rem" a b : float #)
-            member _.NativeIntNativeInt a b = (# "rem" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "rem" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "rem" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 = failwith "refusing to rem pointers"
-
-            member _.Int32ManagedPtr _ a ptr = failwith "refusing to rem pointer"
-
-            member _.ManagedPtrInt32 _ ptr a = failwith "refusing to rem pointer"
-
-            member _.Name = "mul"
-        }
-
-    let mulOvf =
-        { new IArithmeticOperation with
-            member _.Int32Int32 a b = (# "mul.ovf" a b : int32 #)
-            member _.Int64Int64 a b = (# "mul.ovf" a b : int64 #)
-            member _.FloatFloat a b = (# "mul.ovf" a b : float #)
-            member _.NativeIntNativeInt a b = (# "mul.ovf" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "mul.ovf" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "mul.ovf" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ManagedPointerSource.Null, _ -> Choice2Of2 (nativeint 0)
-                | _, ManagedPointerSource.Null -> Choice2Of2 (nativeint 0)
-                | _, _ -> failwith "refusing to multiply two managed pointers"
-
-            member _.Int32ManagedPtr state a ptr = mulInt32ManagedPtr state a ptr
-            member _.ManagedPtrInt32 state a ptr = mulInt32ManagedPtr state ptr a
-
-            member _.Name = "mul_ovf"
-        }
-
-    let div =
-        { new IArithmeticOperation with
-            member _.Int32Int32 a b = (# "div" a b : int32 #)
-            member _.Int64Int64 a b = (# "div" a b : int64 #)
-            member _.FloatFloat a b = (# "div" a b : float #)
-            member _.NativeIntNativeInt a b = (# "div" a b : nativeint #)
-            member _.Int32NativeInt a b = (# "div" a b : nativeint #)
-            member _.NativeIntInt32 a b = (# "div" a b : nativeint #)
-
-            member _.ManagedPtrManagedPtr _ ptr1 ptr2 =
-                match ptr1, ptr2 with
-                | ManagedPointerSource.Null, _ -> Choice2Of2 (nativeint 0)
-                | _, _ -> failwith "refusing to divide two managed pointers"
-
-            member _.Int32ManagedPtr _ a ptr =
-                if a = 0 then
-                    Choice2Of2 0
-                else
-                    failwith "refusing to divide pointers"
-
-            member _.ManagedPtrInt32 _ ptr a =
-                if a = 1 then
-                    Choice1Of2 ptr
-                else
-                    failwith "refusing to divide a pointer"
-
-            member _.Name = "div"
-        }
-
 [<RequireQualifiedAccess>]
 module BinaryArithmetic =
-    let execute
-        (op : IArithmeticOperation)
-        (state : IlMachineState)
-        (val1 : EvalStackValue)
-        (val2 : EvalStackValue)
-        : EvalStackValue
-        =
+    let execute (op : IArithmeticOperation) (val1 : EvalStackValue) (val2 : EvalStackValue) : EvalStackValue =
         // see table at https://learn.microsoft.com/en-us/dotnet/api/system.reflection.emit.opcodes.add?view=net-9.0
         match val1, val2 with
         | EvalStackValue.Int32 val1, EvalStackValue.Int32 val2 -> op.Int32Int32 val1 val2 |> EvalStackValue.Int32
-        | EvalStackValue.Int32 val1, EvalStackValue.NativeInt val2 ->
-            let val2 =
-                match val2 with
-                | NativeIntSource.Verbatim n -> nativeint<int64> n
-                | v -> failwith $"refusing to operate on non-verbatim native int %O{v}"
-
-            op.Int32NativeInt val1 val2
-            |> int64<nativeint>
-            |> NativeIntSource.Verbatim
-            |> EvalStackValue.NativeInt
-        | EvalStackValue.Int32 val1, EvalStackValue.ManagedPointer val2 ->
-            match op.Int32ManagedPtr state val1 val2 with
-            | Choice1Of2 v -> EvalStackValue.ManagedPointer v
-            | Choice2Of2 i -> EvalStackValue.Int32 i
+        | EvalStackValue.Int32 val1, EvalStackValue.NativeInt val2 -> failwith "" |> EvalStackValue.NativeInt
+        | EvalStackValue.Int32 val1, EvalStackValue.ManagedPointer val2 -> failwith "" |> EvalStackValue.ManagedPointer
         | EvalStackValue.Int32 val1, EvalStackValue.ObjectRef val2 -> failwith "" |> EvalStackValue.ObjectRef
         | EvalStackValue.Int64 val1, EvalStackValue.Int64 val2 -> op.Int64Int64 val1 val2 |> EvalStackValue.Int64
-        | EvalStackValue.NativeInt val1, EvalStackValue.Int32 val2 ->
-            let val1 =
-                match val1 with
-                | NativeIntSource.Verbatim n -> nativeint<int64> n
-                | v -> failwith $"refusing to operate on non-verbatim native int %O{v}"
-
-            op.NativeIntInt32 val1 val2
-            |> int64<nativeint>
-            |> NativeIntSource.Verbatim
-            |> EvalStackValue.NativeInt
-        | EvalStackValue.NativeInt val1, EvalStackValue.NativeInt val2 ->
-            let val1 =
-                match val1 with
-                | NativeIntSource.Verbatim n -> nativeint<int64> n
-                | v -> failwith $"refusing to operate on non-verbatim native int %O{v}"
-
-            let val2 =
-                match val2 with
-                | NativeIntSource.Verbatim n -> nativeint<int64> n
-                | v -> failwith $"refusing to operate on non-verbatim native int %O{v}"
-
-            op.NativeIntNativeInt val1 val2
-            |> int64<nativeint>
-            |> NativeIntSource.Verbatim
-            |> EvalStackValue.NativeInt
+        | EvalStackValue.NativeInt val1, EvalStackValue.Int32 val2 -> failwith "" |> EvalStackValue.NativeInt
+        | EvalStackValue.NativeInt val1, EvalStackValue.NativeInt val2 -> failwith "" |> EvalStackValue.NativeInt
         | EvalStackValue.NativeInt val1, EvalStackValue.ManagedPointer val2 ->
             failwith "" |> EvalStackValue.ManagedPointer
         | EvalStackValue.NativeInt val1, EvalStackValue.ObjectRef val2 -> failwith "" |> EvalStackValue.ObjectRef
@@ -283,13 +53,6 @@ module BinaryArithmetic =
         | EvalStackValue.ManagedPointer val1, EvalStackValue.NativeInt val2 ->
             failwith "" |> EvalStackValue.ManagedPointer
         | EvalStackValue.ObjectRef val1, EvalStackValue.NativeInt val2 -> failwith "" |> EvalStackValue.ObjectRef
-        | EvalStackValue.ManagedPointer val1, EvalStackValue.Int32 val2 ->
-            match op.ManagedPtrInt32 state val1 val2 with
-            | Choice1Of2 result -> EvalStackValue.ManagedPointer result
-            | Choice2Of2 result -> EvalStackValue.NativeInt (NativeIntSource.Verbatim (int64<int32> result))
+        | EvalStackValue.ManagedPointer val1, EvalStackValue.Int32 val2 -> failwith "" |> EvalStackValue.ManagedPointer
         | EvalStackValue.ObjectRef val1, EvalStackValue.Int32 val2 -> failwith "" |> EvalStackValue.ObjectRef
-        | EvalStackValue.ManagedPointer val1, EvalStackValue.ManagedPointer val2 ->
-            match op.ManagedPtrManagedPtr state val1 val2 with
-            | Choice1Of2 result -> EvalStackValue.ManagedPointer result
-            | Choice2Of2 result -> EvalStackValue.NativeInt (NativeIntSource.Verbatim (int64<nativeint> result))
         | val1, val2 -> failwith $"invalid %s{op.Name} operation: {val1} and {val2}"

WoofWare.PawPrint/Constants.fs

@@ -8,9 +8,3 @@ module Constants =
 
     [<Literal>]
     let SIZEOF_OBJ = 8
-
-    [<Literal>]
-    let DEFAULT_STRUCT_ALIGNMENT = 8
-
-    [<Literal>]
-    let NATIVE_INT_SIZE = 8

WoofWare.PawPrint/Corelib.fs

@@ -1,8 +1,5 @@
 namespace WoofWare.PawPrint
 
-open System.Collections.Immutable
-open System.Reflection.Metadata
-
 [<RequireQualifiedAccess>]
 module Corelib =
 
@@ -152,66 +149,6 @@ module Corelib =
             )
             |> Seq.exactlyOne
 
-        let exceptionType =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "Exception" then Some v else None)
-            |> Seq.exactlyOne
-
-        let arithmeticException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "ArithmeticException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let divideByZeroException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "DivideByZeroException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let overflowException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "OverflowException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let stackOverflowException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "StackOverflowException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let typeLoadException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "TypeLoadException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let indexOutOfRangeException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "IndexOutOfRangeException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let invalidCastException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "InvalidCastException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let missingFieldException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "MissingFieldException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let missingMethodException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "MissingMethodException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let nullReferenceException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "NullReferenceException" then Some v else None)
-            |> Seq.exactlyOne
-
-        let outOfMemoryException =
-            corelib.TypeDefs
-            |> Seq.choose (fun (KeyValue (_, v)) -> if v.Name = "OutOfMemoryException" then Some v else None)
-            |> Seq.exactlyOne
-
         {
             Corelib = corelib
             String = stringType
@@ -242,94 +179,4 @@ module Corelib =
             TypedReference = typedReferenceType
             IntPtr = intPtrType
             UIntPtr = uintPtrType
-            Exception = exceptionType
-            ArithmeticException = arithmeticException
-            DivideByZeroException = divideByZeroException
-            OverflowException = overflowException
-            StackOverflowException = stackOverflowException
-            TypeLoadException = typeLoadException
-            IndexOutOfRangeException = indexOutOfRangeException
-            InvalidCastException = invalidCastException
-            MissingFieldException = missingFieldException
-            MissingMethodException = missingMethodException
-            NullReferenceException = nullReferenceException
-            OutOfMemoryException = outOfMemoryException
         }
-
-    let concretizeAll
-        (loaded : ImmutableDictionary<string, DumpedAssembly>)
-        (bct : BaseClassTypes<DumpedAssembly>)
-        (t : AllConcreteTypes)
-        : AllConcreteTypes
-        =
-        let ctx =
-            {
-                TypeConcretization.ConcretizationContext.InProgress = ImmutableDictionary.Empty
-                TypeConcretization.ConcretizationContext.ConcreteTypes = t
-                TypeConcretization.ConcretizationContext.LoadedAssemblies = loaded
-                TypeConcretization.ConcretizationContext.BaseTypes = bct
-            }
-
-        let loader =
-            { new IAssemblyLoad with
-                member _.LoadAssembly _ _ _ =
-                    failwith "should have already loaded this assembly"
-            }
-
-        let tys =
-            [
-                bct.String
-                bct.Boolean
-                bct.Char
-                bct.SByte
-                bct.Byte
-                bct.Int16
-                bct.UInt16
-                bct.Int32
-                bct.UInt32
-                bct.Int64
-                bct.UInt64
-                bct.Single
-                bct.Double
-                bct.Array
-                bct.Enum
-                bct.ValueType
-                bct.DelegateType
-                bct.Object
-                bct.RuntimeTypeHandle
-                bct.RuntimeMethodHandle
-                bct.RuntimeFieldHandle
-                bct.RuntimeFieldInfoStub
-                bct.RuntimeFieldHandleInternal
-                bct.RuntimeType
-                bct.Void
-                bct.TypedReference
-                bct.IntPtr
-                bct.UIntPtr
-            ]
-
-        (ctx, tys)
-        ||> List.fold (fun ctx ty ->
-            let stk =
-                match DumpedAssembly.resolveBaseType ctx.BaseTypes ctx.LoadedAssemblies ty.Assembly ty.BaseType with
-                | ResolvedBaseType.Enum
-                | ResolvedBaseType.ValueType -> SignatureTypeKind.ValueType
-                | ResolvedBaseType.Object
-                | ResolvedBaseType.Delegate -> SignatureTypeKind.Class
-
-            let _handle, ctx =
-                TypeConcretization.concretizeType
-                    ctx
-                    loader
-                    ty.Assembly
-                    ImmutableArray.Empty
-                    ImmutableArray.Empty
-                    (TypeDefn.FromDefinition (
-                        ComparableTypeDefinitionHandle.Make ty.TypeDefHandle,
-                        ty.Assembly.FullName,
-                        stk
-                    ))
-
-            ctx
-        )
-        |> _.ConcreteTypes

WoofWare.PawPrint/EvalStack.fs

@@ -1,7 +1,5 @@
 namespace WoofWare.PawPrint
 
-#nowarn "42"
-
 /// See I.12.3.2.1 for definition
 type EvalStackValue =
     | Int32 of int32
@@ -10,8 +8,9 @@ type EvalStackValue =
     | Float of float
     | ManagedPointer of ManagedPointerSource
     | ObjectRef of ManagedHeapAddress
-    /// This doesn't match what the CLR does in reality, but we can work out whatever we need from it.
-    | UserDefinedValueType of CliValueType
+    // Fraser thinks this isn't really a thing in CoreCLR
+    // | TransientPointer of TransientPointerSource
+    | UserDefinedValueType of EvalStackValueUserType
 
     override this.ToString () =
         match this with
@@ -21,7 +20,40 @@ type EvalStackValue =
         | EvalStackValue.Float f -> $"Float(%f{f})"
         | EvalStackValue.ManagedPointer managedPointerSource -> $"Pointer(%O{managedPointerSource})"
         | EvalStackValue.ObjectRef managedHeapAddress -> $"ObjectRef(%O{managedHeapAddress})"
-        | EvalStackValue.UserDefinedValueType evalStackValues -> $"Struct(%O{evalStackValues})"
+        | EvalStackValue.UserDefinedValueType evalStackValues ->
+            let desc =
+                evalStackValues.Fields
+                |> List.map (_.ContentsEval >> string<EvalStackValue>)
+                |> String.concat " | "
+
+            $"Struct(%s{desc})"
+
+and EvalStackValueField =
+    {
+        Name : string
+        ContentsEval : EvalStackValue
+        Offset : int option
+    }
+
+and EvalStackValueUserType =
+    {
+        Fields : EvalStackValueField list
+    }
+
+    static member DereferenceField (name : string) (this : EvalStackValueUserType) =
+        // TODO: this doesn't account for overlapping fields
+        this.Fields
+        |> List.pick (fun stackField ->
+            if stackField.Name = name then
+                Some stackField.ContentsEval
+            else
+                None
+        )
+
+    static member OfFields (fields : EvalStackValueField list) =
+        {
+            Fields = fields
+        }
 
 [<RequireQualifiedAccess>]
 module EvalStackValue =
@@ -49,7 +81,6 @@ module EvalStackValue =
                     failwith "todo"
             | NativeIntSource.ManagedPointer _ -> failwith "TODO"
             | NativeIntSource.FunctionPointer _ -> failwith "TODO"
-            | NativeIntSource.FieldHandlePtr _ -> failwith "TODO"
             | NativeIntSource.TypeHandlePtr _ -> failwith "TODO"
         | EvalStackValue.Float f -> failwith "todo"
         | EvalStackValue.ManagedPointer managedPointerSource ->
@@ -78,14 +109,7 @@ module EvalStackValue =
         match value with
         | EvalStackValue.Int32 i -> Some (int64<int> i)
         | EvalStackValue.Int64 i -> Some i
-        | EvalStackValue.NativeInt src ->
-            match src with
-            | NativeIntSource.Verbatim int64 -> Some int64
-            | NativeIntSource.ManagedPointer ManagedPointerSource.Null -> Some 0L
-            | NativeIntSource.ManagedPointer _
-            | NativeIntSource.FunctionPointer _
-            | NativeIntSource.TypeHandlePtr _
-            | NativeIntSource.FieldHandlePtr _ -> failwith "refusing to convert pointer to int64"
+        | EvalStackValue.NativeInt nativeIntSource -> failwith "todo"
         | EvalStackValue.Float f -> failwith "todo"
         | EvalStackValue.ManagedPointer managedPointerSource -> failwith "todo"
         | EvalStackValue.ObjectRef managedHeapAddress -> failwith "todo"
@@ -102,52 +126,6 @@ module EvalStackValue =
         | EvalStackValue.ObjectRef managedHeapAddress -> failwith "todo"
         | EvalStackValue.UserDefinedValueType evalStackValues -> failwith "todo"
 
-    /// Then truncates to int32.
-    let convToUInt8 (value : EvalStackValue) : int32 option =
-        match value with
-        | EvalStackValue.Int32 (i : int32) ->
-            let v = (# "conv.u1" i : uint8 #)
-            Some (int32<uint8> v)
-        | EvalStackValue.Int64 int64 ->
-            let v = (# "conv.u1" int64 : uint8 #)
-            Some (int32<uint8> v)
-        | EvalStackValue.NativeInt nativeIntSource -> failwith "todo"
-        | EvalStackValue.Float f -> failwith "todo"
-        | EvalStackValue.ManagedPointer managedPointerSource -> failwith "todo"
-        | EvalStackValue.ObjectRef managedHeapAddress -> failwith "todo"
-        | EvalStackValue.UserDefinedValueType evalStackValues -> failwith "todo"
-
-    let rec ofCliType (v : CliType) : EvalStackValue =
-        match v with
-        | CliType.Numeric numeric ->
-            match numeric with
-            | CliNumericType.Int32 i -> EvalStackValue.Int32 i
-            | CliNumericType.Int64 i -> EvalStackValue.Int64 i
-            | CliNumericType.NativeInt i -> EvalStackValue.NativeInt i
-            // Sign-extend types int8 and int16
-            // Zero-extend unsigned int8/unsigned int16
-            | CliNumericType.Int8 b -> int32<int8> b |> EvalStackValue.Int32
-            | CliNumericType.UInt8 b -> int32<uint8> b |> EvalStackValue.Int32
-            | CliNumericType.Int16 s -> int32<int16> s |> EvalStackValue.Int32
-            | CliNumericType.UInt16 s -> int32<uint16> s |> EvalStackValue.Int32
-            | CliNumericType.Float32 f -> EvalStackValue.Float (float<float32> f)
-            | CliNumericType.Float64 f -> EvalStackValue.Float f
-            | CliNumericType.NativeFloat f -> EvalStackValue.Float f
-        | CliType.ObjectRef i ->
-            match i with
-            | None -> EvalStackValue.ManagedPointer ManagedPointerSource.Null
-            | Some i -> EvalStackValue.ManagedPointer (ManagedPointerSource.Heap i)
-        // Zero-extend bool/char
-        | CliType.Bool b -> int32 b |> EvalStackValue.Int32
-        | CliType.Char (high, low) -> int32 high * 256 + int32 low |> EvalStackValue.Int32
-        | CliType.RuntimePointer ptr ->
-            match ptr with
-            | CliRuntimePointer.Verbatim ptrInt -> NativeIntSource.Verbatim ptrInt |> EvalStackValue.NativeInt
-            | CliRuntimePointer.FieldRegistryHandle ptrInt ->
-                NativeIntSource.FieldHandlePtr ptrInt |> EvalStackValue.NativeInt
-            | CliRuntimePointer.Managed ptr -> ptr |> EvalStackValue.ManagedPointer
-        | CliType.ValueType fields -> EvalStackValue.UserDefinedValueType fields
-
     let rec toCliTypeCoerced (target : CliType) (popped : EvalStackValue) : CliType =
         match target with
         | CliType.Numeric numeric ->
@@ -156,12 +134,10 @@ module EvalStackValue =
                 match popped with
                 | EvalStackValue.Int32 i -> CliType.Numeric (CliNumericType.Int32 i)
                 | EvalStackValue.UserDefinedValueType popped ->
-                    let popped = CliValueType.DereferenceFieldAt 0 4 popped
-                    // TODO: when we have a general mechanism to coerce CliTypes to each other,
-                    // do that
-                    match popped with
-                    | CliType.Numeric (CliNumericType.Int32 i) -> CliType.Numeric (CliNumericType.Int32 i)
-                    | _ -> failwith "TODO"
+                    match popped.Fields with
+                    | [] -> failwith "unexpectedly empty"
+                    | [ popped ] -> toCliTypeCoerced target popped.ContentsEval
+                    | _ -> failwith $"TODO: %O{target}"
                 | i -> failwith $"TODO: %O{i}"
             | CliNumericType.Int64 _ ->
                 match popped with
@@ -171,7 +147,7 @@ module EvalStackValue =
                     | NativeIntSource.Verbatim i -> CliType.Numeric (CliNumericType.Int64 i)
                     | NativeIntSource.ManagedPointer ptr -> failwith "TODO"
                     | NativeIntSource.FunctionPointer f -> failwith $"TODO: {f}"
-                    | NativeIntSource.FieldHandlePtr f -> failwith $"TODO: {f}"
+                    // CliType.Numeric (CliNumericType.ProvenanceTrackedNativeInt64 f)
                     | NativeIntSource.TypeHandlePtr f -> failwith $"TODO: {f}"
                 // CliType.Numeric (CliNumericType.TypeHandlePtr f)
                 | i -> failwith $"TODO: %O{i}"
@@ -182,21 +158,9 @@ module EvalStackValue =
                     CliNumericType.NativeInt (NativeIntSource.ManagedPointer ptrSrc)
                     |> CliType.Numeric
                 | EvalStackValue.UserDefinedValueType vt ->
-                    let popped = CliValueType.DereferenceFieldAt 0 NATIVE_INT_SIZE vt
-                    // TODO: when we have a general mechanism to coerce CliTypes to each other,
-                    // do that
-                    match popped with
-                    | CliType.Numeric (CliNumericType.NativeInt i) -> CliType.Numeric (CliNumericType.NativeInt i)
-                    | CliType.Numeric (CliNumericType.Int64 i) ->
-                        CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.Verbatim i))
-                    | CliType.RuntimePointer ptr ->
-                        match ptr with
-                        | CliRuntimePointer.Verbatim i ->
-                            CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.Verbatim i))
-                        | CliRuntimePointer.FieldRegistryHandle ptr ->
-                            CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.FieldHandlePtr ptr))
-                        | CliRuntimePointer.Managed src ->
-                            CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.ManagedPointer src))
+                    match vt.Fields with
+                    | [] -> failwith "unexpected"
+                    | [ vt ] -> toCliTypeCoerced target vt.ContentsEval
                     | _ -> failwith $"TODO: {popped}"
                 | _ -> failwith $"TODO: {popped}"
             | CliNumericType.NativeFloat f -> failwith "todo"
@@ -227,9 +191,11 @@ module EvalStackValue =
         | CliType.ObjectRef _ ->
             match popped with
             | EvalStackValue.ManagedPointer ptrSource ->
-                ptrSource |> CliRuntimePointer.Managed |> CliType.RuntimePointer
+                CliRuntimePointerSource.ofManagedPointerSource ptrSource
+                |> CliRuntimePointer.Managed
+                |> CliType.RuntimePointer
             | EvalStackValue.ObjectRef ptr ->
-                ManagedPointerSource.Heap ptr
+                CliRuntimePointerSource.Heap ptr
                 |> CliRuntimePointer.Managed
                 |> CliType.RuntimePointer
             | EvalStackValue.NativeInt nativeIntSource ->
@@ -238,18 +204,15 @@ module EvalStackValue =
                 | NativeIntSource.Verbatim i -> failwith $"refusing to interpret verbatim native int {i} as a pointer"
                 | NativeIntSource.FunctionPointer _ -> failwith "TODO"
                 | NativeIntSource.TypeHandlePtr _ -> failwith "refusing to interpret type handle ID as an object ref"
-                | NativeIntSource.FieldHandlePtr _ -> failwith "refusing to interpret field handle ID as an object ref"
                 | NativeIntSource.ManagedPointer ptr ->
                     match ptr with
                     | ManagedPointerSource.Null -> CliType.ObjectRef None
                     | ManagedPointerSource.Heap s -> CliType.ObjectRef (Some s)
                     | _ -> failwith "TODO"
             | EvalStackValue.UserDefinedValueType obj ->
-                let popped = CliValueType.DereferenceFieldAt 0 NATIVE_INT_SIZE obj
-
-                match popped with
-                | CliType.ObjectRef r -> CliType.ObjectRef r
-                | _ -> failwith "TODO"
+                match obj.Fields with
+                | [ esv ] -> toCliTypeCoerced target esv.ContentsEval
+                | fields -> failwith $"TODO: don't know how to coerce struct of {fields} to a pointer"
             | _ -> failwith $"TODO: {popped}"
         | CliType.Bool _ ->
             match popped with
@@ -261,17 +224,22 @@ module EvalStackValue =
             | i -> failwith $"TODO: %O{i}"
         | CliType.RuntimePointer _ ->
             match popped with
-            | EvalStackValue.ManagedPointer src -> src |> CliRuntimePointer.Managed |> CliType.RuntimePointer
+            | EvalStackValue.ManagedPointer src ->
+                CliRuntimePointerSource.ofManagedPointerSource src
+                |> CliRuntimePointer.Managed
+                |> CliType.RuntimePointer
             | EvalStackValue.NativeInt intSrc ->
                 match intSrc with
-                | NativeIntSource.Verbatim i -> CliType.RuntimePointer (CliRuntimePointer.Verbatim i)
-                | NativeIntSource.ManagedPointer src -> src |> CliRuntimePointer.Managed |> CliType.RuntimePointer
+                | NativeIntSource.Verbatim i -> CliType.RuntimePointer (CliRuntimePointer.Unmanaged i)
+                | NativeIntSource.ManagedPointer src ->
+                    CliRuntimePointerSource.ofManagedPointerSource src
+                    |> CliRuntimePointer.Managed
+                    |> CliType.RuntimePointer
                 | NativeIntSource.FunctionPointer methodInfo ->
                     CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.FunctionPointer methodInfo))
                 | NativeIntSource.TypeHandlePtr int64 -> failwith "todo"
-                | NativeIntSource.FieldHandlePtr int64 -> failwith "todo"
             | EvalStackValue.ObjectRef addr ->
-                ManagedPointerSource.Heap addr
+                CliRuntimePointerSource.Heap addr
                 |> CliRuntimePointer.Managed
                 |> CliType.RuntimePointer
             | _ -> failwith $"TODO: %O{popped}"
@@ -284,38 +252,91 @@ module EvalStackValue =
             | popped -> failwith $"Unexpectedly wanted a char from {popped}"
         | CliType.ValueType vt ->
             match popped with
-            | EvalStackValue.UserDefinedValueType popped' ->
-                match CliValueType.TrySequentialFields vt, CliValueType.TrySequentialFields popped' with
-                | Some vt, Some popped ->
-                    if vt.Length <> popped.Length then
-                        failwith
-                            $"mismatch: popped value type {popped} (length %i{popped.Length}) into {vt} (length %i{vt.Length})"
+            | EvalStackValue.UserDefinedValueType popped ->
+                if vt.Fields.Length <> popped.Fields.Length then
+                    // TODO: overlapping fields
+                    failwith
+                        $"mismatch: popped value type {popped} (length %i{popped.Fields.Length}) into {vt} (length %i{vt.Fields.Length})"
 
-                    (vt, popped)
-                    ||> List.map2 (fun field1 popped ->
-                        if field1.Name <> popped.Name then
-                            failwith $"TODO: name mismatch, {field1.Name} vs {popped.Name}"
+                (vt.Fields, popped.Fields)
+                ||> List.map2 (fun field1 popped ->
+                    if field1.Name <> popped.Name then
+                        failwith $"TODO: name mismatch, {field1.Name} vs {popped.Name}"
 
-                        if field1.Offset <> popped.Offset then
-                            failwith $"TODO: offset mismatch for {field1.Name}, {field1.Offset} vs {popped.Offset}"
+                    if field1.Offset <> popped.Offset then
+                        failwith $"TODO: offset mismatch for {field1.Name}, {field1.Offset} vs {popped.Offset}"
 
-                        let contents = toCliTypeCoerced field1.Contents (ofCliType popped.Contents)
+                    let contents = toCliTypeCoerced field1.Contents popped.ContentsEval
 
-                        {
-                            CliField.Name = field1.Name
-                            Contents = contents
-                            Offset = field1.Offset
-                            Type = field1.Type
-                        }
-                    )
-                    |> CliValueType.OfFields popped'.Layout
-                    |> CliType.ValueType
-                | _, _ -> failwith "TODO: overlapping fields going onto eval stack"
+                    {
+                        CliField.Name = field1.Name
+                        Contents = contents
+                        Offset = field1.Offset
+                    }
+                )
+                |> CliValueType.OfFields
+                |> CliType.ValueType
             | popped ->
-                match CliValueType.TryExactlyOneField vt with
-                | Some field -> toCliTypeCoerced field.Contents popped
+                match vt.Fields with
+                | [ field ] -> toCliTypeCoerced field.Contents popped
                 | _ -> failwith $"TODO: {popped} into value type {target}"
 
+    let rec ofCliType (v : CliType) : EvalStackValue =
+        match v with
+        | CliType.Numeric numeric ->
+            match numeric with
+            | CliNumericType.Int32 i -> EvalStackValue.Int32 i
+            | CliNumericType.Int64 i -> EvalStackValue.Int64 i
+            | CliNumericType.NativeInt i -> EvalStackValue.NativeInt i
+            // Sign-extend types int8 and int16
+            // Zero-extend unsigned int8/unsigned int16
+            | CliNumericType.Int8 b -> int32<int8> b |> EvalStackValue.Int32
+            | CliNumericType.UInt8 b -> int32<uint8> b |> EvalStackValue.Int32
+            | CliNumericType.Int16 s -> int32<int16> s |> EvalStackValue.Int32
+            | CliNumericType.UInt16 s -> int32<uint16> s |> EvalStackValue.Int32
+            | CliNumericType.Float32 f -> EvalStackValue.Float (float<float32> f)
+            | CliNumericType.Float64 f -> EvalStackValue.Float f
+            | CliNumericType.NativeFloat f -> EvalStackValue.Float f
+        | CliType.ObjectRef i ->
+            match i with
+            | None -> EvalStackValue.ManagedPointer ManagedPointerSource.Null
+            | Some i -> EvalStackValue.ManagedPointer (ManagedPointerSource.Heap i)
+        // Zero-extend bool/char
+        | CliType.Bool b -> int32 b |> EvalStackValue.Int32
+        | CliType.Char (high, low) -> int32 high * 256 + int32 low |> EvalStackValue.Int32
+        | CliType.RuntimePointer ptr ->
+            match ptr with
+            | CliRuntimePointer.Unmanaged ptrInt -> NativeIntSource.Verbatim ptrInt |> EvalStackValue.NativeInt
+            | CliRuntimePointer.Managed ptr ->
+                match ptr with
+                | CliRuntimePointerSource.LocalVariable (sourceThread, methodFrame, var) ->
+                    ManagedPointerSource.LocalVariable (sourceThread, methodFrame, var)
+                    |> EvalStackValue.ManagedPointer
+                | CliRuntimePointerSource.ArrayIndex (arr, ind) ->
+                    ManagedPointerSource.ArrayIndex (arr, ind) |> EvalStackValue.ManagedPointer
+                | CliRuntimePointerSource.Argument (sourceThread, methodFrame, var) ->
+                    ManagedPointerSource.Argument (sourceThread, methodFrame, var)
+                    |> EvalStackValue.ManagedPointer
+                | CliRuntimePointerSource.Heap addr -> EvalStackValue.ObjectRef addr
+                | CliRuntimePointerSource.Null -> EvalStackValue.ManagedPointer ManagedPointerSource.Null
+                | CliRuntimePointerSource.Field (source, fieldName) ->
+                    ManagedPointerSource.Field (CliRuntimePointerSource.toManagedPointerSource source, fieldName)
+                    |> EvalStackValue.ManagedPointer
+        | CliType.ValueType fields ->
+            // TODO: this is a bit dubious; we're being a bit sloppy with possibly-overlapping fields here
+            fields.Fields
+            |> List.map (fun field ->
+                let contents = ofCliType field.Contents
+
+                {
+                    Name = field.Name
+                    Offset = field.Offset
+                    ContentsEval = contents
+                }
+            )
+            |> EvalStackValueUserType.OfFields
+            |> EvalStackValue.UserDefinedValueType
+
 type EvalStack =
     {
         Values : EvalStackValue list

WoofWare.PawPrint/EvalStackValueComparisons.fs

@@ -123,14 +123,24 @@ module EvalStackValueComparisons =
     let rec ceq (var1 : EvalStackValue) (var2 : EvalStackValue) : bool =
         // Table III.4
         match var1, var2 with
-        | EvalStackValue.UserDefinedValueType var1, v ->
-            match CliValueType.TryExactlyOneField var1 with
-            | None -> failwith "TODO"
-            | Some var1 -> ceq (EvalStackValue.ofCliType var1.Contents) v
-        | u, EvalStackValue.UserDefinedValueType var2 ->
-            match CliValueType.TryExactlyOneField var2 with
-            | None -> failwith "TODO"
-            | Some var2 -> ceq u (EvalStackValue.ofCliType var2.Contents)
+        | EvalStackValue.UserDefinedValueType {
+                                                  Fields = [ f ]
+                                              },
+          v -> ceq f.ContentsEval v
+        | u,
+          EvalStackValue.UserDefinedValueType {
+                                                  Fields = [ f ]
+                                              } -> ceq u f.ContentsEval
+        | EvalStackValue.UserDefinedValueType {
+                                                  Fields = []
+                                              },
+          EvalStackValue.UserDefinedValueType {
+                                                  Fields = []
+                                              } ->
+            // hmm, surely this can't happen, but :shrug:
+            true
+        | EvalStackValue.UserDefinedValueType _, _
+        | _, EvalStackValue.UserDefinedValueType _ -> failwith $"TODO: ceq {var1} vs {var2}"
         | EvalStackValue.Int32 var1, EvalStackValue.Int32 var2 -> var1 = var2
         | EvalStackValue.Int32 var1, EvalStackValue.NativeInt var2 -> failwith "TODO: int32 CEQ nativeint"
         | EvalStackValue.Int32 _, _ -> failwith $"bad ceq: Int32 vs {var2}"
@@ -163,7 +173,6 @@ module EvalStackValueComparisons =
             | ManagedPointerSource.LocalVariable _
             | ManagedPointerSource.Argument _ -> false
             | ManagedPointerSource.ArrayIndex (arr, index) -> failwith "todo"
-            | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "todo"
         | EvalStackValue.ObjectRef _, _ -> failwith $"bad ceq: ObjectRef vs {var2}"
         | EvalStackValue.ManagedPointer var1, EvalStackValue.ManagedPointer var2 -> var1 = var2
         | EvalStackValue.ManagedPointer var1, EvalStackValue.NativeInt var2 ->

WoofWare.PawPrint/ExternImplementations/System.Threading.Monitor.fs

@@ -89,7 +89,6 @@ module System_Threading_Monitor =
                     | ManagedPointerSource.Heap addr -> failwith "todo: managed heap"
                     | ManagedPointerSource.ArrayIndex _ -> failwith "todo: array index"
                     | ManagedPointerSource.Field (managedPointerSource, fieldName) -> failwith "todo"
-                    | ManagedPointerSource.InterpretedAsType _ -> failwith "TODO"
 
                 (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
 

WoofWare.PawPrint/FieldHandleRegistry.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.PawPrint
 
-open System.Collections.Immutable
 open System.Reflection
 open System.Reflection.Metadata
 
@@ -34,9 +33,8 @@ module FieldHandleRegistry =
     /// Returns a (struct) System.RuntimeFieldHandle, with its contents (reference type) freshly allocated if necessary.
     let getOrAllocate
         (baseClassTypes : BaseClassTypes<'corelib>)
-        (allConcreteTypes : AllConcreteTypes)
         (allocState : 'allocState)
-        (allocate : CliValueType -> 'allocState -> ManagedHeapAddress * 'allocState)
+        (allocate : CliField list -> 'allocState -> ManagedHeapAddress * 'allocState)
         (declaringAssy : AssemblyName)
         (declaringType : ConcreteTypeHandle)
         (handle : FieldDefinitionHandle)
@@ -59,17 +57,9 @@ module FieldHandleRegistry =
                 Name = "m_ptr"
                 Contents = CliType.ofManagedObject runtimeFieldInfoStub
                 Offset = None
-                Type =
-                    AllConcreteTypes.findExistingConcreteType
-                        allConcreteTypes
-                        (baseClassTypes.RuntimeFieldInfoStub.Assembly,
-                         baseClassTypes.RuntimeFieldInfoStub.Namespace,
-                         baseClassTypes.RuntimeFieldInfoStub.Name,
-                         ImmutableArray.Empty)
-                    |> Option.get
             }
             |> List.singleton
-            |> CliValueType.OfFields Layout.Default
+            |> CliValueType.OfFields
             |> CliType.ValueType
 
         let handle =
@@ -98,90 +88,50 @@ module FieldHandleRegistry =
             // https://github.com/dotnet/runtime/blob/2b21c73fa2c32fa0195e4a411a435dda185efd08/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs#L1380
             {
                 Name = "m_handle"
-                Contents = CliType.RuntimePointer (CliRuntimePointer.FieldRegistryHandle newHandle)
+                Contents = CliType.RuntimePointer (CliRuntimePointer.Unmanaged newHandle)
                 Offset = None // no struct layout was specified
-                Type =
-                    AllConcreteTypes.findExistingConcreteType
-                        allConcreteTypes
-                        (baseClassTypes.IntPtr.Assembly,
-                         baseClassTypes.IntPtr.Namespace,
-                         baseClassTypes.IntPtr.Name,
-                         ImmutableArray.Empty)
-                    |> Option.get
             }
             |> List.singleton
-            |> CliValueType.OfFields Layout.Default
+            |> CliValueType.OfFields
             |> CliType.ValueType
 
         // https://github.com/dotnet/runtime/blob/1d1bf92fcf43aa6981804dc53c5174445069c9e4/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs#L1074
         let runtimeFieldInfoStub =
-            let objType =
-                AllConcreteTypes.findExistingConcreteType
-                    allConcreteTypes
-                    (baseClassTypes.Object.Assembly,
-                     baseClassTypes.Object.Namespace,
-                     baseClassTypes.Object.Name,
-                     ImmutableArray.Empty)
-                |> Option.get
-
-            let intType =
-                AllConcreteTypes.findExistingConcreteType
-                    allConcreteTypes
-                    (baseClassTypes.Int32.Assembly,
-                     baseClassTypes.Int32.Namespace,
-                     baseClassTypes.Int32.Name,
-                     ImmutableArray.Empty)
-                |> Option.get
-
             // LayoutKind.Sequential
             [
                 // If we ever implement a GC, something should change here
                 {
                     Name = "m_keepalive"
                     Contents = CliType.ObjectRef None
-                    Offset = None
-                    Type = objType
+                    Offset = Some 0
                 }
                 {
                     Name = "m_c"
                     Contents = CliType.ObjectRef None
-                    Offset = None
-                    Type = objType
+                    Offset = Some SIZEOF_OBJ
                 }
                 {
                     Name = "m_d"
                     Contents = CliType.ObjectRef None
-                    Offset = None
-                    Type = objType
+                    Offset = Some (SIZEOF_OBJ * 2)
                 }
                 {
                     Name = "m_b"
                     Contents = CliType.Numeric (CliNumericType.Int32 0)
-                    Offset = None
-                    Type = intType
+                    Offset = Some (SIZEOF_OBJ * 3)
                 }
                 {
                     Name = "m_e"
                     Contents = CliType.ObjectRef None
-                    Offset = None
-                    Type = objType
+                    Offset = Some (SIZEOF_OBJ * 3 + SIZEOF_INT)
                 }
                 // RuntimeFieldHandleInternal: https://github.com/dotnet/runtime/blob/1d1bf92fcf43aa6981804dc53c5174445069c9e4/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs#L1048
                 {
                     Name = "m_fieldHandle"
                     Contents = runtimeFieldHandleInternal
-                    Offset = None
-                    Type =
-                        AllConcreteTypes.findExistingConcreteType
-                            allConcreteTypes
-                            (baseClassTypes.RuntimeFieldHandleInternal.Assembly,
-                             baseClassTypes.RuntimeFieldHandleInternal.Namespace,
-                             baseClassTypes.RuntimeFieldHandleInternal.Name,
-                             ImmutableArray.Empty)
-                        |> Option.get
+                    Offset = Some (SIZEOF_OBJ * 4 + SIZEOF_INT)
                 }
             ]
-            |> CliValueType.OfFields Layout.Default // explicitly sequential but no custom packing size
 
         let alloc, state = allocate runtimeFieldInfoStub allocState
 

WoofWare.PawPrint/IlMachineState.fs

@@ -614,7 +614,7 @@ module IlMachineState =
         (typeGenerics : ConcreteTypeHandle ImmutableArray)
         (methodGenerics : ConcreteTypeHandle ImmutableArray)
         (state : IlMachineState)
-        : IlMachineState * CliType * ConcreteTypeHandle
+        : IlMachineState * CliType
         =
 
         // First concretize the type
@@ -630,7 +630,7 @@ module IlMachineState =
 
         // Now get the zero value
         let zero, state = cliTypeZeroOfHandle state baseClassTypes handle
-        state, zero, handle
+        state, zero
 
     let pushToEvalStack' (o : EvalStackValue) (thread : ThreadId) (state : IlMachineState) =
         let activeThreadState = state.ThreadState.[thread]
@@ -753,9 +753,14 @@ module IlMachineState =
             | ResolvedBaseType.Delegate
             | ResolvedBaseType.Object -> state |> pushToEvalStack (CliType.ofManagedObject constructing) currentThread
             | ResolvedBaseType.ValueType ->
+                let vt =
+                    {
+                        CliValueType.Fields = constructed.Fields
+                    }
+
                 state
                 // TODO: ordering of fields probably important
-                |> pushToEvalStack (CliType.ValueType constructed.Contents) currentThread
+                |> pushToEvalStack (CliType.ValueType vt) currentThread
             | ResolvedBaseType.Enum -> failwith "TODO"
         | None ->
             match threadStateAtEndOfMethod.MethodState.EvaluationStack.Values with
@@ -1124,13 +1129,13 @@ module IlMachineState =
 
     let allocateManagedObject
         (ty : ConcreteTypeHandle)
-        (fields : CliValueType)
+        (fields : CliField list)
         (state : IlMachineState)
         : ManagedHeapAddress * IlMachineState
         =
         let o =
             {
-                Contents = fields
+                Fields = fields
                 ConcreteType = ty
                 SyncBlock = SyncBlock.Free
             }
@@ -1434,7 +1439,6 @@ module IlMachineState =
         | ManagedPointerSource.ArrayIndex (arr, index) -> getArrayValue arr index state |> CliType.getField fieldName
         | ManagedPointerSource.Field (src, fieldName) -> failwith "todo"
         | ManagedPointerSource.Null -> failwith "TODO: throw NRE"
-        | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "TODO"
 
     let setFieldValue
         (obj : ManagedPointerSource)
@@ -1464,14 +1468,8 @@ module IlMachineState =
             state |> setArrayValue arr v index
         | ManagedPointerSource.Field (managedPointerSource, fieldName) -> failwith "todo"
         | ManagedPointerSource.Null -> failwith "TODO: throw NRE"
-        | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "TODO"
 
-    let executeDelegateConstructor
-        (baseClassTypes : BaseClassTypes<DumpedAssembly>)
-        (instruction : MethodState)
-        (state : IlMachineState)
-        : IlMachineState
-        =
+    let executeDelegateConstructor (instruction : MethodState) (state : IlMachineState) : IlMachineState =
         // We've been called with arguments already popped from the stack into local arguments.
         let constructing = instruction.Arguments.[0]
         let targetObj = instruction.Arguments.[1]
@@ -1479,17 +1477,17 @@ module IlMachineState =
 
         let targetObj =
             match targetObj with
-            | CliType.RuntimePointer (CliRuntimePointer.Managed (ManagedPointerSource.Heap target))
+            | CliType.RuntimePointer (CliRuntimePointer.Managed (CliRuntimePointerSource.Heap target))
             | CliType.ObjectRef (Some target) -> Some target
             | CliType.ObjectRef None
-            | CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null) -> None
+            | CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null) -> None
             | _ -> failwith $"Unexpected target type for delegate: {targetObj}"
 
         let constructing =
             match constructing with
-            | CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null)
+            | CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null)
             | CliType.ObjectRef None -> failwith "unexpectedly constructing the null delegate"
-            | CliType.RuntimePointer (CliRuntimePointer.Managed (ManagedPointerSource.Heap target))
+            | CliType.RuntimePointer (CliRuntimePointer.Managed (CliRuntimePointerSource.Heap target))
             | CliType.ObjectRef (Some target) -> target
             | _ -> failwith $"Unexpectedly not constructing a managed object: {constructing}"
 
@@ -1500,42 +1498,24 @@ module IlMachineState =
 
         // Standard delegate fields in .NET are _target and _methodPtr
         // Update the fields with the target object and method pointer
-        let allConcreteTypes = state.ConcreteTypes
+        let updatedFields =
+            // Let's not consider field ordering for reference types like delegates.
+            // Nobody's going to be marshalling a reference type anyway, I hope.
+            {
+                Name = "_target"
+                Contents = CliType.ObjectRef targetObj
+                Offset = None
+            }
+            :: {
+                   Name = "_methodPtr"
+                   Contents = methodPtr
+                   Offset = None
+               }
+            :: heapObj.Fields
 
         let updatedObj =
-            let newContents =
-                heapObj.Contents
-                |> CliValueType.AddField
-                    {
-                        Name = "_target"
-                        Contents = CliType.ObjectRef targetObj
-                        Offset = None
-                        Type =
-                            AllConcreteTypes.findExistingConcreteType
-                                allConcreteTypes
-                                (baseClassTypes.Object.Assembly,
-                                 baseClassTypes.Object.Namespace,
-                                 baseClassTypes.Object.Name,
-                                 ImmutableArray.Empty)
-                            |> Option.get
-                    }
-                |> CliValueType.AddField
-                    {
-                        Name = "_methodPtr"
-                        Contents = methodPtr
-                        Offset = None
-                        Type =
-                            AllConcreteTypes.findExistingConcreteType
-                                allConcreteTypes
-                                (baseClassTypes.Object.Assembly,
-                                 baseClassTypes.Object.Namespace,
-                                 baseClassTypes.Object.Name,
-                                 ImmutableArray.Empty)
-                            |> Option.get
-                    }
-
             { heapObj with
-                Contents = newContents
+                Fields = updatedFields
             }
 
         let updatedHeap =
@@ -1571,8 +1551,6 @@ module IlMachineState =
 
         let result, reg, state =
             TypeHandleRegistry.getOrAllocate
-                state.ConcreteTypes
-                baseClassTypes
                 state
                 (fun fields state -> allocateManagedObject runtimeType fields state)
                 defn
@@ -1624,7 +1602,6 @@ module IlMachineState =
         let result, reg, state =
             FieldHandleRegistry.getOrAllocate
                 baseClassTypes
-                state.ConcreteTypes
                 state
                 (fun fields state -> allocateManagedObject runtimeType fields state)
                 declaringAssy
@@ -1670,10 +1647,7 @@ module IlMachineState =
             state.ThreadState.[sourceThread].MethodStates.[methodFrame].LocalVariables.[int<uint16> whichVar]
         | ManagedPointerSource.Argument (sourceThread, methodFrame, whichVar) ->
             state.ThreadState.[sourceThread].MethodStates.[methodFrame].Arguments.[int<uint16> whichVar]
-        | ManagedPointerSource.Heap addr ->
-            let result = ManagedHeap.get addr state.ManagedHeap
-            // TODO: this is awfully dubious, this ain't no value type
-            CliType.ValueType result.Contents
+        | ManagedPointerSource.Heap addr -> failwith "todo"
         | ManagedPointerSource.ArrayIndex (arr, index) -> getArrayValue arr index state
         | ManagedPointerSource.Field (addr, name) ->
             let obj = dereferencePointer state addr
@@ -1681,19 +1655,6 @@ module IlMachineState =
             match obj with
             | CliType.ValueType vt -> vt |> CliValueType.DereferenceField name
             | v -> failwith $"could not find field {name} on object {v}"
-        | ManagedPointerSource.InterpretedAsType (src, ty) ->
-            let src = dereferencePointer state src
-
-            let concrete =
-                match
-                    AllConcreteTypes.findExistingConcreteType
-                        state.ConcreteTypes
-                        (ty.Assembly, ty.Namespace, ty.Name, ty.Generics)
-                with
-                | Some ty -> ty
-                | None -> failwith "not concretised type"
-
-            failwith $"TODO: interpret as type %s{ty.Assembly.Name}.%s{ty.Namespace}.%s{ty.Name}, object %O{src}"
 
     let lookupTypeDefn
         (baseClassTypes : BaseClassTypes<DumpedAssembly>)

WoofWare.PawPrint/IlMachineStateExecution.fs

@@ -55,7 +55,6 @@ module IlMachineStateExecution =
             | ManagedPointerSource.ArrayIndex (arr, index) -> failwith "todo"
             | ManagedPointerSource.Null -> failwith "todo"
             | ManagedPointerSource.Field (managedPointerSource, fieldName) -> failwith "todo"
-            | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "todo"
         | EvalStackValue.ObjectRef addr ->
             let o = ManagedHeap.get addr state.ManagedHeap
             state, o.ConcreteType
@@ -118,13 +117,16 @@ module IlMachineStateExecution =
 
         match
             if isIntrinsic then
-                Intrinsics.call loggerFactory baseClassTypes methodToCall thread state
+                Intrinsics.call baseClassTypes methodToCall thread state
             else
                 None
         with
         | Some result -> result
         | None ->
 
+        if methodToCall.Name = "GetValue" then
+            printfn ""
+
         // Get zero values for all parameters
         let state, argZeroObjects =
             ((state, []), methodToCall.Signature.ParameterTypes)
@@ -412,7 +414,7 @@ module IlMachineStateExecution =
                     // where Newobj puts the object pointer on top
                     let thisArg, newState =
                         popAndCoerceArg
-                            (CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null))
+                            (CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null))
                             currentState
 
                     currentState <- newState
@@ -435,7 +437,7 @@ module IlMachineStateExecution =
 
                     let thisArg, newState =
                         popAndCoerceArg
-                            (CliType.RuntimePointer (CliRuntimePointer.Managed ManagedPointerSource.Null))
+                            (CliType.RuntimePointer (CliRuntimePointer.Managed CliRuntimePointerSource.Null))
                             currentState
 
                     args.Add thisArg

WoofWare.PawPrint/Intrinsics.fs

@@ -1,8 +1,6 @@
 namespace WoofWare.PawPrint
 
 open System
-open System.Collections.Immutable
-open Microsoft.Extensions.Logging
 
 [<RequireQualifiedAccess>]
 module Intrinsics =
@@ -20,95 +18,10 @@ module Intrinsics =
             "System.Private.CoreLib", "ReadOnlySpan`1", "get_Length"
             // https://github.com/dotnet/runtime/blob/9e5e6aa7bc36aeb2a154709a9d1192030c30a2ef/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs#L153
             "System.Private.CoreLib", "RuntimeHelpers", "CreateSpan"
-            // https://github.com/dotnet/runtime/blob/d258af50034c192bf7f0a18856bf83d2903d98ae/src/libraries/System.Private.CoreLib/src/System/Math.cs#L127
-            // https://github.com/dotnet/runtime/blob/d258af50034c192bf7f0a18856bf83d2903d98ae/src/libraries/System.Private.CoreLib/src/System/Math.cs#L137
-            "System.Private.CoreLib", "Math", "Abs"
-            // https://github.com/dotnet/runtime/blob/d258af50034c192bf7f0a18856bf83d2903d98ae/src/libraries/System.Private.CoreLib/src/System/Math.cs#L965C10-L1062C19
-            "System.Private.CoreLib", "Math", "Max"
-            // https://github.com/dotnet/runtime/blob/d258af50034c192bf7f0a18856bf83d2903d98ae/src/libraries/System.Private.CoreLib/src/System/Buffer.cs#L150
-            "System.Private.CoreLib", "Buffer", "Memmove"
-            // https://github.com/dotnet/runtime/blob/1c3221b63340d7f81dfd829f3bcd822e582324f6/src/libraries/System.Private.CoreLib/src/System/Threading/Thread.cs#L799
-            "System.Private.CoreLib", "Thread", "get_CurrentThread"
         ]
         |> Set.ofList
 
-    type private RefTypeProcessingStatus =
-        | InProgress
-        | Completed of bool
-
-    let rec private containsRefType
-        (loggerFactory : ILoggerFactory)
-        (baseClassTypes : BaseClassTypes<DumpedAssembly>)
-        (state : IlMachineState)
-        (seenSoFar : ImmutableDictionary<TypeInfo<TypeDefn, TypeDefn>, RefTypeProcessingStatus>)
-        (td : TypeInfo<TypeDefn, TypeDefn>)
-        : IlMachineState * ImmutableDictionary<_, RefTypeProcessingStatus> * bool
-        =
-        match seenSoFar.TryGetValue td with
-        | true, InProgress ->
-            // We've hit a cycle. Optimistically assume this path does not introduce a reference type.
-            // If another path finds a reference type, its 'true' will override this.
-            state, seenSoFar, false
-        | true, Completed v ->
-            // We've already calculated this; return the memoized result.
-            state, seenSoFar, v
-        | false, _ ->
-            // Check if this type itself is a reference type.
-            let baseType =
-                td.BaseType
-                |> DumpedAssembly.resolveBaseType baseClassTypes state._LoadedAssemblies td.Assembly
-
-            match baseType with
-            | ResolvedBaseType.Delegate
-            | ResolvedBaseType.Object ->
-                // Short-circuit: if the type itself is a reference type, we're done.
-                let seenSoFar = seenSoFar.Add (td, Completed true)
-                state, seenSoFar, true
-            | ResolvedBaseType.Enum
-            | ResolvedBaseType.ValueType ->
-                // It's a value type, so we must check its fields.
-                // Mark as in progress before recursing.
-                let seenSoFarWithInProgress = seenSoFar.Add (td, InProgress)
-
-                let stateAfterFieldResolution, nonStaticFields =
-                    ((state, []), td.Fields)
-                    ||> List.fold (fun (currentState, acc) field ->
-                        if field.IsStatic then
-                            currentState, acc
-                        else
-                            // TODO: generics
-                            let newState, _, info =
-                                IlMachineState.resolveTypeFromDefn
-                                    loggerFactory
-                                    baseClassTypes
-                                    field.Signature
-                                    ImmutableArray.Empty
-                                    ImmutableArray.Empty
-                                    (currentState.LoadedAssembly (td.Assembly) |> Option.get)
-                                    currentState
-
-                            newState, info :: acc
-                    )
-
-                // Recurse through the fields, correctly propagating state.
-                let finalState, finalSeenSoFar, fieldsContainRefType =
-                    ((stateAfterFieldResolution, seenSoFarWithInProgress, false), nonStaticFields)
-                    ||> List.fold (fun (currentState, currentSeenSoFar, currentResult) field ->
-                        if currentResult then
-                            (currentState, currentSeenSoFar, true) // Short-circuit
-                        else
-                            let newState, newSeenSoFar, fieldResult =
-                                containsRefType loggerFactory baseClassTypes currentState currentSeenSoFar field
-
-                            (newState, newSeenSoFar, currentResult || fieldResult)
-                    )
-
-                // Mark as completed with the final result before returning.
-                let finalSeenSoFar = finalSeenSoFar.SetItem (td, Completed fieldsContainRefType)
-                finalState, finalSeenSoFar, fieldsContainRefType
-
     let call
-        (loggerFactory : ILoggerFactory)
         (baseClassTypes : BaseClassTypes<_>)
         (methodToCall : WoofWare.PawPrint.MethodInfo<ConcreteTypeHandle, ConcreteTypeHandle, ConcreteTypeHandle>)
         (currentThread : ThreadId)
@@ -159,9 +72,9 @@ module Intrinsics =
                 let rec go (arg : EvalStackValue) =
                     match arg with
                     | EvalStackValue.UserDefinedValueType vt ->
-                        match CliValueType.TryExactlyOneField vt with
-                        | None -> failwith "TODO"
-                        | Some field -> go (EvalStackValue.ofCliType field.Contents)
+                        match vt.Fields with
+                        | [ field ] -> go field.ContentsEval
+                        | _ -> failwith $"TODO: %O{vt}"
                     | EvalStackValue.ManagedPointer ManagedPointerSource.Null -> failwith "TODO: throw NRE"
                     | EvalStackValue.ObjectRef addr
                     | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap addr) -> Some addr
@@ -175,68 +88,36 @@ module Intrinsics =
                     {
                         Name = "m_type"
                         Contents = CliType.ObjectRef arg
-                        Offset = None
-                        Type =
-                            AllConcreteTypes.findExistingConcreteType
-                                state.ConcreteTypes
-                                (baseClassTypes.RuntimeType.Assembly,
-                                 baseClassTypes.RuntimeType.Namespace,
-                                 baseClassTypes.RuntimeType.Name,
-                                 ImmutableArray.Empty)
-                            |> Option.get
+                        Offset = Some 0
                     }
                     |> List.singleton
-                    |> CliValueType.OfFields Layout.Default
+                    |> CliValueType.OfFields
 
                 IlMachineState.pushToEvalStack (CliType.ValueType vt) currentThread state
                 |> IlMachineState.advanceProgramCounter currentThread
 
             Some state
-        | "System.Private.CoreLib", "Type", "get_IsValueType" ->
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [], ConcreteBool state.ConcreteTypes -> ()
-            | _ -> failwith "bad signature Type.get_IsValueType"
-
-            let this, state = IlMachineState.popEvalStack currentThread state
-
-            let this =
-                match this with
-                | EvalStackValue.ObjectRef ptr ->
-                    IlMachineState.dereferencePointer state (ManagedPointerSource.Heap ptr)
-                | EvalStackValue.ManagedPointer ptr -> IlMachineState.dereferencePointer state ptr
-                | EvalStackValue.Float _
-                | EvalStackValue.Int32 _
-                | EvalStackValue.Int64 _ -> failwith "refusing to dereference literal"
-                | _ -> failwith "TODO"
-            // `this` should be of type Type
-            let ty =
-                match this with
-                | CliType.ValueType cvt ->
-                    match CliValueType.DereferenceField "m_handle" cvt with
-                    | CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.TypeHandlePtr cth)) -> cth
-                    | _ -> failwith ""
-                | _ -> failwith "expected a Type"
-
-            let ty = AllConcreteTypes.lookup ty state.ConcreteTypes |> Option.get
-            let ty = state.LoadedAssembly(ty.Assembly).Value.TypeDefs.[ty.Definition.Get]
-
-            let isValueType =
-                match DumpedAssembly.resolveBaseType baseClassTypes state._LoadedAssemblies ty.Assembly ty.BaseType with
-                | ResolvedBaseType.Enum
-                | ResolvedBaseType.ValueType -> true
-                | ResolvedBaseType.Object
-                | ResolvedBaseType.Delegate -> false
-
-            IlMachineState.pushToEvalStack (CliType.ofBool isValueType) currentThread state
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
         | "System.Private.CoreLib", "Unsafe", "AsPointer" ->
             // Method signature: 1 generic parameter, we take a Byref of that parameter, and return a TypeDefn.Pointer(Void)
             let arg, state = IlMachineState.popEvalStack currentThread state
 
             let toPush =
                 match arg with
-                | EvalStackValue.ManagedPointer ptr -> CliRuntimePointer.Managed ptr
+                | EvalStackValue.ManagedPointer ptr ->
+                    match ptr with
+                    | ManagedPointerSource.LocalVariable (sourceThread, methodFrame, whichVar) ->
+                        CliRuntimePointer.Managed (
+                            CliRuntimePointerSource.LocalVariable (sourceThread, methodFrame, whichVar)
+                        )
+                    | ManagedPointerSource.Argument (sourceThread, methodFrame, whichVar) ->
+                        CliRuntimePointer.Managed (
+                            CliRuntimePointerSource.Argument (sourceThread, methodFrame, whichVar)
+                        )
+                    | ManagedPointerSource.Heap managedHeapAddress ->
+                        CliRuntimePointer.Managed (CliRuntimePointerSource.Heap managedHeapAddress)
+                    | ManagedPointerSource.Null -> failwith "todo"
+                    | ManagedPointerSource.ArrayIndex _ -> failwith "TODO"
+                    | ManagedPointerSource.Field _ -> failwith "TODO"
                 | x -> failwith $"TODO: Unsafe.AsPointer(%O{x})"
 
             IlMachineState.pushToEvalStack (CliType.RuntimePointer toPush) currentThread state
@@ -273,47 +154,6 @@ module Intrinsics =
             let result =
                 BitConverter.Int32BitsToSingle arg |> CliNumericType.Float32 |> CliType.Numeric
 
-            state
-            |> IlMachineState.pushToEvalStack result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
-        | "System.Private.CoreLib", "BitConverter", "DoubleToUInt64Bits" ->
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [ ConcreteDouble state.ConcreteTypes ], ConcreteUInt64 state.ConcreteTypes -> ()
-            | _ -> failwith "bad signature BitConverter.DoubleToUInt64Bits"
-
-            let arg, state = IlMachineState.popEvalStack currentThread state
-
-            let arg =
-                match arg with
-                | EvalStackValue.Float i -> i
-                | _ -> failwith "$TODO: {arr}"
-
-            let result =
-                BitConverter.DoubleToUInt64Bits arg
-                |> int64<uint64>
-                |> CliNumericType.Int64
-                |> CliType.Numeric
-
-            state
-            |> IlMachineState.pushToEvalStack result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
-        | "System.Private.CoreLib", "BitConverter", "UInt64BitsToDouble" ->
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [ ConcreteUInt64 state.ConcreteTypes ], ConcreteDouble state.ConcreteTypes -> ()
-            | _ -> failwith "bad signature BitConverter.DoubleToUInt64Bits"
-
-            let arg, state = IlMachineState.popEvalStack currentThread state
-
-            let arg =
-                match arg with
-                | EvalStackValue.Int64 i -> uint64 i
-                | _ -> failwith "$TODO: {arr}"
-
-            let result =
-                BitConverter.UInt64BitsToDouble arg |> CliNumericType.Float64 |> CliType.Numeric
-
             state
             |> IlMachineState.pushToEvalStack result currentThread
             |> IlMachineState.advanceProgramCounter currentThread
@@ -349,44 +189,6 @@ module Intrinsics =
                 | EvalStackValue.Float f -> BitConverter.DoubleToInt64Bits f |> EvalStackValue.Int64
                 | _ -> failwith "TODO"
 
-            state
-            |> IlMachineState.pushToEvalStack' result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
-        | "System.Private.CoreLib", "BitConverter", "SingleToUInt32Bits" ->
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [ ConcreteSingle state.ConcreteTypes ], ConcreteUInt32 state.ConcreteTypes -> ()
-            | _ -> failwith "bad signature BitConverter.SingleToUInt32Bits"
-
-            let arg, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                match arg with
-                | EvalStackValue.Float f ->
-                    BitConverter.SingleToUInt32Bits (float32<float> f)
-                    |> int<uint32>
-                    |> EvalStackValue.Int32
-                | _ -> failwith "TODO"
-
-            state
-            |> IlMachineState.pushToEvalStack' result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
-        | "System.Private.CoreLib", "BitConverter", "UInt32BitsToSingle" ->
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [ ConcreteUInt32 state.ConcreteTypes ], ConcreteSingle state.ConcreteTypes -> ()
-            | _ -> failwith "bad signature BitConverter.UInt32BitsToSingle"
-
-            let arg, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                match arg with
-                | EvalStackValue.Int32 f ->
-                    BitConverter.UInt32BitsToSingle (uint32<int> f)
-                    |> float<float32>
-                    |> EvalStackValue.Float
-                | _ -> failwith "TODO"
-
             state
             |> IlMachineState.pushToEvalStack' result currentThread
             |> IlMachineState.advanceProgramCounter currentThread
@@ -400,8 +202,7 @@ module Intrinsics =
                 let arg1 =
                     match arg1 with
                     | EvalStackValue.ObjectRef h
-                    | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap h) -> Some h
-                    | EvalStackValue.ManagedPointer ManagedPointerSource.Null -> None
+                    | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap h) -> h
                     | EvalStackValue.Int32 _
                     | EvalStackValue.Int64 _
                     | EvalStackValue.Float _ -> failwith $"this isn't a string! {arg1}"
@@ -412,38 +213,32 @@ module Intrinsics =
                 let arg2 =
                     match arg2 with
                     | EvalStackValue.ObjectRef h
-                    | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap h) -> Some h
-                    | EvalStackValue.ManagedPointer ManagedPointerSource.Null -> None
+                    | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap h) -> h
                     | EvalStackValue.Int32 _
                     | EvalStackValue.Int64 _
                     | EvalStackValue.Float _ -> failwith $"this isn't a string! {arg2}"
                     | _ -> failwith $"TODO: %O{arg2}"
 
-                let areEqual =
-                    match arg1, arg2 with
-                    | None, None -> true
-                    | Some _, None
-                    | None, Some _ -> false
-                    | Some arg1, Some arg2 ->
-                        if arg1 = arg2 then
-                            true
-                        else
+                if arg1 = arg2 then
+                    state
+                    |> IlMachineState.pushToEvalStack (CliType.ofBool true) currentThread
+                    |> IlMachineState.advanceProgramCounter currentThread
+                    |> Some
+                else
 
-                        let arg1 = ManagedHeap.get arg1 state.ManagedHeap
-                        let arg2 = ManagedHeap.get arg2 state.ManagedHeap
+                let arg1 = ManagedHeap.get arg1 state.ManagedHeap
+                let arg2 = ManagedHeap.get arg2 state.ManagedHeap
 
-                        if
-                            AllocatedNonArrayObject.DereferenceField "_firstChar" arg1
-                            <> AllocatedNonArrayObject.DereferenceField "_firstChar" arg2
-                        then
-                            false
-                        else
-                            failwith "TODO"
-
-                state
-                |> IlMachineState.pushToEvalStack (CliType.ofBool areEqual) currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-                |> Some
+                if
+                    AllocatedNonArrayObject.DereferenceField "_firstChar" arg1
+                    <> AllocatedNonArrayObject.DereferenceField "_firstChar" arg2
+                then
+                    state
+                    |> IlMachineState.pushToEvalStack (CliType.ofBool false) currentThread
+                    |> IlMachineState.advanceProgramCounter currentThread
+                    |> Some
+                else
+                    failwith "TODO"
             | _ -> None
         | "System.Private.CoreLib", "Unsafe", "ReadUnaligned" ->
             let ptr, state = IlMachineState.popEvalStack currentThread state
@@ -454,10 +249,16 @@ module Intrinsics =
                     | EvalStackValue.ManagedPointer src -> IlMachineState.dereferencePointer state src
                     | EvalStackValue.NativeInt src -> failwith "TODO"
                     | EvalStackValue.ObjectRef ptr -> failwith "TODO"
-                    | EvalStackValue.UserDefinedValueType vt ->
-                        match CliValueType.TryExactlyOneField vt with
-                        | None -> failwith "TODO"
-                        | Some field -> go (EvalStackValue.ofCliType field.Contents)
+                    | EvalStackValue.UserDefinedValueType {
+                                                              Fields = [ f ]
+                                                          } -> go f.ContentsEval
+                    | EvalStackValue.UserDefinedValueType {
+                                                              Fields = []
+                                                          } -> failwith "unexpected no-fields object"
+                    | EvalStackValue.UserDefinedValueType {
+                                                              Fields = _ :: _ :: _
+                                                          } ->
+                        failwith "TODO: check overlapping fields to see if this is a pointer"
                     | EvalStackValue.Int32 _
                     | EvalStackValue.Int64 _
                     | EvalStackValue.Float _ -> failwith $"this isn't a pointer! {ptr}"
@@ -504,10 +305,10 @@ module Intrinsics =
 
             let arg = Seq.exactlyOne methodToCall.Generics
 
-            let state, result =
+            let result =
                 // Some types appear circular, because they're hardcoded in the runtime. We have to special-case them.
                 match arg with
-                | ConcreteChar state.ConcreteTypes -> state, false
+                | ConcreteChar state.ConcreteTypes -> false
                 | _ ->
 
                 let generic = AllConcreteTypes.lookup arg state.ConcreteTypes
@@ -518,7 +319,7 @@ module Intrinsics =
                     | Some generic -> generic
 
                 let td =
-                    state.LoadedAssembly generic.Assembly
+                    state.LoadedAssembly (generic.Assembly)
                     |> Option.get
                     |> fun a -> a.TypeDefs.[generic.Definition.Get]
 
@@ -527,14 +328,15 @@ module Intrinsics =
                     |> DumpedAssembly.resolveBaseType baseClassTypes state._LoadedAssemblies generic.Assembly
 
                 match baseType with
-                | ResolvedBaseType.Enum
+                | ResolvedBaseType.Enum -> false
                 | ResolvedBaseType.ValueType ->
-                    td
-                    |> TypeInfo.mapGeneric (fun (par, _) -> TypeDefn.GenericTypeParameter par.SequenceNumber)
-                    |> containsRefType loggerFactory baseClassTypes state ImmutableDictionary.Empty
-                    |> fun (state, _, result) -> state, result
+                    let nonStaticFields =
+                        td.Fields
+                        |> List.choose (fun field -> if field.IsStatic then None else Some field.Signature)
+
+                    failwith $"TODO: search the fields on {td.Namespace}.{td.Name}: {nonStaticFields}"
                 | ResolvedBaseType.Object
-                | ResolvedBaseType.Delegate -> state, true
+                | ResolvedBaseType.Delegate -> true
 
             let state =
                 state
@@ -581,26 +383,8 @@ module Intrinsics =
                 | None -> failwith "somehow have not concretised ret type"
                 | Some t -> t
 
-            let inputAddr, state = IlMachineState.popEvalStack currentThread state
-
-            let ptr =
-                match inputAddr with
-                | EvalStackValue.Int32 _
-                | EvalStackValue.Int64 _
-                | EvalStackValue.Float _ -> failwith "expected pointer type"
-                | EvalStackValue.NativeInt nativeIntSource -> failwith "todo"
-                | EvalStackValue.ManagedPointer src ->
-                    ManagedPointerSource.InterpretedAsType (src, to_)
-                    |> EvalStackValue.ManagedPointer
-                | EvalStackValue.ObjectRef addr ->
-                    ManagedPointerSource.InterpretedAsType (ManagedPointerSource.Heap addr, to_)
-                    |> EvalStackValue.ManagedPointer
-                | EvalStackValue.UserDefinedValueType evalStackValueUserType -> failwith "todo"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack' ptr currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
+            failwith "TODO: transmute fields etc"
+            let state = state |> IlMachineState.advanceProgramCounter currentThread
 
             Some state
         | "System.Private.CoreLib", "Unsafe", "SizeOf" ->
@@ -628,35 +412,5 @@ module Intrinsics =
         | "System.Private.CoreLib", "Type", "op_Equality" ->
             // https://github.com/dotnet/runtime/blob/ec11903827fc28847d775ba17e0cd1ff56cfbc2e/src/libraries/System.Private.CoreLib/src/System/Type.cs#L703
             None
-        | "System.Private.CoreLib", "MemoryMarshal", "GetArrayDataReference" ->
-            // https://github.com/dotnet/runtime/blob/d258af50034c192bf7f0a18856bf83d2903d98ae/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs#L20
-            let generic = Seq.exactlyOne methodToCall.Generics
-
-            match methodToCall.Signature.ParameterTypes, methodToCall.Signature.ReturnType with
-            | [ ConcreteGenericArray state.ConcreteTypes generic ], ConcreteByref t when t = generic -> ()
-            | _ -> failwith "bad signature MemoryMarshal.GetArrayDataReference"
-
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let toPush =
-                match arr with
-                | EvalStackValue.Int32 _
-                | EvalStackValue.Int64 _
-                | EvalStackValue.Float _ -> failwith "expected reference"
-                | EvalStackValue.NativeInt nativeIntSource -> failwith "todo"
-                | EvalStackValue.ObjectRef addr
-                | EvalStackValue.ManagedPointer (ManagedPointerSource.Heap addr) ->
-                    if not (state.ManagedHeap.Arrays.ContainsKey addr) then
-                        failwith "array not found"
-
-                    EvalStackValue.ManagedPointer (ManagedPointerSource.ArrayIndex (addr, 0))
-                | EvalStackValue.UserDefinedValueType evalStackValueUserType -> failwith "todo"
-                | EvalStackValue.ManagedPointer ManagedPointerSource.Null -> failwith "TODO: raise NRE"
-                | EvalStackValue.ManagedPointer _ -> failwith "todo"
-
-            state
-            |> IlMachineState.pushToEvalStack' toPush currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Some
         | a, b, c -> failwith $"TODO: implement JIT intrinsic {a}.{b}.{c}"
         |> Option.map (fun s -> s.WithThreadSwitchedToAssembly callerAssy currentThread |> fst)

WoofWare.PawPrint/ManagedHeap.fs

@@ -8,18 +8,36 @@ type SyncBlock =
 
 type AllocatedNonArrayObject =
     {
-        // TODO: this is a slightly odd domain; the same type for value types as class types!
-        Contents : CliValueType
+        Fields : CliField list
         ConcreteType : ConcreteTypeHandle
         SyncBlock : SyncBlock
     }
 
     static member DereferenceField (name : string) (f : AllocatedNonArrayObject) : CliType =
-        CliValueType.DereferenceField name f.Contents
+        // TODO: this is wrong, it doesn't account for overlapping fields
+        f.Fields |> List.find (fun f -> f.Name = name) |> _.Contents
 
     static member SetField (name : string) (v : CliType) (f : AllocatedNonArrayObject) : AllocatedNonArrayObject =
+        // TODO: this is wrong, it doesn't account for overlapping fields
+        let contents =
+            {
+                Name = name
+                Contents = v
+                Offset = None
+            }
+
         { f with
-            Contents = CliValueType.WithFieldSet name v f.Contents
+            Fields =
+                f.Fields
+                |> List.replaceWhere (fun f ->
+                    if f.Name = name then
+                        Some
+                            { contents with
+                                Offset = f.Offset
+                            }
+                    else
+                        None
+                )
         }
 
 type AllocatedArray =

WoofWare.PawPrint/NullaryIlOp.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.PawPrint
 
-open System
 open Microsoft.Extensions.Logging
 
 [<RequireQualifiedAccess>]
@@ -82,39 +81,53 @@ module NullaryIlOp =
         | EvalStackValue.ManagedPointer src ->
             match src with
             | ManagedPointerSource.Null -> failwith "TODO: throw NullReferenceException"
-            | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "TODO"
             | ManagedPointerSource.Argument (sourceThread, methodFrame, whichVar) ->
                 failwith "unexpected - can we really write to an argument?"
             | ManagedPointerSource.LocalVariable (sourceThread, methodFrame, whichVar) ->
-                state
-                |> IlMachineState.setLocalVariable
-                    sourceThread
-                    methodFrame
-                    whichVar
-                    (EvalStackValue.toCliTypeCoerced varType valueToStore)
+                { state with
+                    ThreadState =
+                        state.ThreadState
+                        |> Map.change
+                            sourceThread
+                            (fun state ->
+                                match state with
+                                | None -> failwith "tried to store in local variables of nonexistent stack frame"
+                                | Some state ->
+                                    let frame = state.MethodStates.[methodFrame]
+
+                                    let frame =
+                                        { frame with
+                                            LocalVariables =
+                                                frame.LocalVariables.SetItem (
+                                                    int<uint16> whichVar,
+                                                    EvalStackValue.toCliTypeCoerced varType valueToStore
+                                                )
+                                        }
+
+                                    { state with
+                                        MethodStates = state.MethodStates.SetItem (methodFrame, frame)
+                                    }
+                                    |> Some
+                            )
+                }
             | ManagedPointerSource.Heap managedHeapAddress -> failwith "todo"
             | ManagedPointerSource.ArrayIndex _ -> failwith "todo"
-            | ManagedPointerSource.Field (managedPointerSource, fieldName) ->
-                state
-                |> IlMachineState.setFieldValue
-                    managedPointerSource
-                    (EvalStackValue.toCliTypeCoerced varType valueToStore)
-                    fieldName
+            | ManagedPointerSource.Field (managedPointerSource, fieldName) -> failwith "todo"
         | EvalStackValue.ObjectRef managedHeapAddress -> failwith "todo"
 
-    let internal getArrayElt
+    let internal ldElem
+        (targetCliTypeZero : CliType)
         (index : EvalStackValue)
         (arr : EvalStackValue)
         (currentThread : ThreadId)
         (state : IlMachineState)
-        : CliType
+        : ExecutionResult
         =
         let index =
             match index with
             | EvalStackValue.NativeInt src ->
                 match src with
                 | NativeIntSource.FunctionPointer _
-                | NativeIntSource.FieldHandlePtr _
                 | NativeIntSource.TypeHandlePtr _
                 | NativeIntSource.ManagedPointer _ -> failwith "Refusing to treat a pointer as an array index"
                 | NativeIntSource.Verbatim i -> i |> int32
@@ -128,7 +141,14 @@ module NullaryIlOp =
             | EvalStackValue.ManagedPointer ManagedPointerSource.Null -> failwith "TODO: throw NRE"
             | _ -> failwith $"Invalid array: %O{arr}"
 
-        IlMachineState.getArrayValue arrAddr index state
+        let value = IlMachineState.getArrayValue arrAddr index state
+
+        let state =
+            state
+            |> IlMachineState.pushToEvalStack value currentThread
+            |> IlMachineState.advanceProgramCounter currentThread
+
+        ExecutionResult.Stepped (state, WhatWeDid.Executed)
 
     let internal stElem
         (targetCliTypeZero : CliType)
@@ -144,7 +164,6 @@ module NullaryIlOp =
             | EvalStackValue.NativeInt src ->
                 match src with
                 | NativeIntSource.FunctionPointer _
-                | NativeIntSource.FieldHandlePtr _
                 | NativeIntSource.TypeHandlePtr _
                 | NativeIntSource.ManagedPointer _ -> failwith "Refusing to treat a pointer as an array index"
                 | NativeIntSource.Verbatim i -> i |> int32
@@ -411,7 +430,7 @@ module NullaryIlOp =
         | Sub ->
             let val2, state = IlMachineState.popEvalStack currentThread state
             let val1, state = IlMachineState.popEvalStack currentThread state
-            let result = BinaryArithmetic.execute ArithmeticOperation.sub state val1 val2
+            let result = BinaryArithmetic.execute ArithmeticOperation.sub val1 val2
 
             state
             |> IlMachineState.pushToEvalStack' result currentThread
@@ -421,84 +440,30 @@ module NullaryIlOp =
         | Sub_ovf -> failwith "TODO: Sub_ovf unimplemented"
         | Sub_ovf_un -> failwith "TODO: Sub_ovf_un unimplemented"
         | Add ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
             let val1, state = IlMachineState.popEvalStack currentThread state
-            let result = BinaryArithmetic.execute ArithmeticOperation.add state val1 val2
+            let val2, state = IlMachineState.popEvalStack currentThread state
+            let result = BinaryArithmetic.execute ArithmeticOperation.add val1 val2
 
             state
             |> IlMachineState.pushToEvalStack' result currentThread
             |> IlMachineState.advanceProgramCounter currentThread
             |> Tuple.withRight WhatWeDid.Executed
             |> ExecutionResult.Stepped
-        | Add_ovf ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
-            let val1, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                try
-                    BinaryArithmetic.execute ArithmeticOperation.addOvf state val1 val2 |> Ok
-                with :? OverflowException as e ->
-                    Error e
-
-            let state =
-                match result with
-                | Ok result -> state |> IlMachineState.pushToEvalStack' result currentThread
-                | Error excToThrow -> failwith "TODO: throw OverflowException"
-
-            state
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Tuple.withRight WhatWeDid.Executed
-            |> ExecutionResult.Stepped
+        | Add_ovf -> failwith "TODO: Add_ovf unimplemented"
         | Add_ovf_un -> failwith "TODO: Add_ovf_un unimplemented"
         | Mul ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
             let val1, state = IlMachineState.popEvalStack currentThread state
-            let result = BinaryArithmetic.execute ArithmeticOperation.mul state val1 val2
+            let val2, state = IlMachineState.popEvalStack currentThread state
+            let result = BinaryArithmetic.execute ArithmeticOperation.mul val1 val2
 
             state
             |> IlMachineState.pushToEvalStack' result currentThread
             |> IlMachineState.advanceProgramCounter currentThread
             |> Tuple.withRight WhatWeDid.Executed
             |> ExecutionResult.Stepped
-        | Mul_ovf ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
-            let val1, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                try
-                    BinaryArithmetic.execute ArithmeticOperation.mulOvf state val1 val2 |> Ok
-                with :? OverflowException as e ->
-                    Error e
-
-            let state =
-                match result with
-                | Ok result -> state |> IlMachineState.pushToEvalStack' result currentThread
-                | Error excToThrow -> failwith "TODO: throw OverflowException"
-
-            state
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Tuple.withRight WhatWeDid.Executed
-            |> ExecutionResult.Stepped
+        | Mul_ovf -> failwith "TODO: Mul_ovf unimplemented"
         | Mul_ovf_un -> failwith "TODO: Mul_ovf_un unimplemented"
-        | Div ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
-            let val1, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                try
-                    BinaryArithmetic.execute ArithmeticOperation.div state val1 val2 |> Ok
-                with :? OverflowException as e ->
-                    Error e
-
-            let state =
-                match result with
-                | Ok result -> state |> IlMachineState.pushToEvalStack' result currentThread
-                | Error excToThrow -> failwith "TODO: throw OverflowException"
-
-            state
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Tuple.withRight WhatWeDid.Executed
-            |> ExecutionResult.Stepped
+        | Div -> failwith "TODO: Div unimplemented"
         | Div_un -> failwith "TODO: Div_un unimplemented"
         | Shr ->
             let shift, state = IlMachineState.popEvalStack currentThread state
@@ -525,33 +490,7 @@ module NullaryIlOp =
                 |> IlMachineState.advanceProgramCounter currentThread
 
             (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
-        | Shr_un ->
-            let shift, state = IlMachineState.popEvalStack currentThread state
-            let number, state = IlMachineState.popEvalStack currentThread state
-
-            let shift =
-                match shift with
-                | EvalStackValue.Int32 i -> i
-                | EvalStackValue.NativeInt (NativeIntSource.Verbatim i) -> int<int64> i
-                | _ -> failwith $"Not allowed shift of {shift}"
-
-            let result =
-                // See table III.6
-                match number with
-                | EvalStackValue.Int32 i -> uint32<int> i >>> shift |> int32<uint32> |> EvalStackValue.Int32
-                | EvalStackValue.Int64 i -> uint64<int64> i >>> shift |> int64<uint64> |> EvalStackValue.Int64
-                | EvalStackValue.NativeInt (NativeIntSource.Verbatim i) ->
-                    (uint64<int64> i >>> shift |> int64<uint64>)
-                    |> NativeIntSource.Verbatim
-                    |> EvalStackValue.NativeInt
-                | _ -> failwith $"Not allowed to shift {number}"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack' result currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
+        | Shr_un -> failwith "TODO: Shr_un unimplemented"
         | Shl ->
             let shift, state = IlMachineState.popEvalStack currentThread state
             let number, state = IlMachineState.popEvalStack currentThread state
@@ -639,37 +578,7 @@ module NullaryIlOp =
                 |> IlMachineState.advanceProgramCounter currentThread
 
             (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
-        | Xor ->
-            let v2, state = IlMachineState.popEvalStack currentThread state
-            let v1, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                match v1, v2 with
-                | EvalStackValue.Int32 v1, EvalStackValue.Int32 v2 -> v1 ^^^ v2 |> EvalStackValue.Int32
-                | EvalStackValue.Int32 v1, EvalStackValue.NativeInt (NativeIntSource.Verbatim v2) ->
-                    int64<int32> v1 ^^^ v2 |> NativeIntSource.Verbatim |> EvalStackValue.NativeInt
-                | EvalStackValue.Int32 _, EvalStackValue.NativeInt _ ->
-                    failwith $"can't do binary operation on non-verbatim native int {v2}"
-                | EvalStackValue.Int64 v1, EvalStackValue.Int64 v2 -> v1 ^^^ v2 |> EvalStackValue.Int64
-                | EvalStackValue.NativeInt (NativeIntSource.Verbatim v1), EvalStackValue.Int32 v2 ->
-                    v1 ^^^ int64<int32> v2 |> NativeIntSource.Verbatim |> EvalStackValue.NativeInt
-                | EvalStackValue.NativeInt _, EvalStackValue.Int32 _ ->
-                    failwith $"can't do binary operation on non-verbatim native int {v1}"
-                | EvalStackValue.NativeInt (NativeIntSource.Verbatim v1),
-                  EvalStackValue.NativeInt (NativeIntSource.Verbatim v2) ->
-                    v1 ^^^ v2 |> NativeIntSource.Verbatim |> EvalStackValue.NativeInt
-                | EvalStackValue.NativeInt (NativeIntSource.Verbatim _), EvalStackValue.NativeInt _ ->
-                    failwith $"can't do binary operation on non-verbatim native int {v2}"
-                | EvalStackValue.NativeInt _, EvalStackValue.NativeInt (NativeIntSource.Verbatim _) ->
-                    failwith $"can't do binary operation on non-verbatim native int {v1}"
-                | _, _ -> failwith $"refusing to do binary operation on {v1} and {v2}"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack' result currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
+        | Xor -> failwith "TODO: Xor unimplemented"
         | Conv_I ->
             let popped, state = IlMachineState.popEvalStack currentThread state
             let converted = EvalStackValue.toNativeInt popped
@@ -740,20 +649,7 @@ module NullaryIlOp =
             let state = state |> IlMachineState.advanceProgramCounter currentThread
 
             (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
-        | Conv_U1 ->
-            let popped, state = IlMachineState.popEvalStack currentThread state
-            let converted = EvalStackValue.convToUInt8 popped
-
-            let state =
-                match converted with
-                | None -> failwith "TODO: Conv_U8 conversion failure unimplemented"
-                | Some conv ->
-                    state
-                    |> IlMachineState.pushToEvalStack' (EvalStackValue.Int32 conv) currentThread
-
-            let state = state |> IlMachineState.advanceProgramCounter currentThread
-
-            (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
+        | Conv_U1 -> failwith "TODO: Conv_U1 unimplemented"
         | Conv_U2 -> failwith "TODO: Conv_U2 unimplemented"
         | Conv_U4 -> failwith "TODO: Conv_U4 unimplemented"
         | Conv_U8 ->
@@ -961,16 +857,7 @@ module NullaryIlOp =
         | Ldind_u8 -> failwith "TODO: Ldind_u8 unimplemented"
         | Ldind_r4 -> executeLdind LdindTargetType.LdindR4 currentThread state
         | Ldind_r8 -> executeLdind LdindTargetType.LdindR8 currentThread state
-        | Rem ->
-            let val2, state = IlMachineState.popEvalStack currentThread state
-            let val1, state = IlMachineState.popEvalStack currentThread state
-            let result = BinaryArithmetic.execute ArithmeticOperation.rem state val1 val2
-
-            state
-            |> IlMachineState.pushToEvalStack' result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Tuple.withRight WhatWeDid.Executed
-            |> ExecutionResult.Stepped
+        | Rem -> failwith "TODO: Rem unimplemented"
         | Rem_un -> failwith "TODO: Rem_un unimplemented"
         | Volatile -> failwith "TODO: Volatile unimplemented"
         | Tail -> failwith "TODO: Tail unimplemented"
@@ -987,22 +874,7 @@ module NullaryIlOp =
         | Conv_ovf_i -> failwith "TODO: Conv_ovf_i unimplemented"
         | Conv_ovf_u -> failwith "TODO: Conv_ovf_u unimplemented"
         | Neg -> failwith "TODO: Neg unimplemented"
-        | Not ->
-            let val1, state = IlMachineState.popEvalStack currentThread state
-
-            let result =
-                match val1 with
-                | EvalStackValue.Int32 i -> ~~~i |> EvalStackValue.Int32
-                | EvalStackValue.Int64 i -> ~~~i |> EvalStackValue.Int64
-                | EvalStackValue.ManagedPointer _
-                | EvalStackValue.ObjectRef _ -> failwith "refusing to negate a pointer"
-                | _ -> failwith "TODO"
-
-            state
-            |> IlMachineState.pushToEvalStack' result currentThread
-            |> IlMachineState.advanceProgramCounter currentThread
-            |> Tuple.withRight WhatWeDid.Executed
-            |> ExecutionResult.Stepped
+        | Not -> failwith "TODO: Not unimplemented"
         | Ldind_ref ->
             let addr, state = IlMachineState.popEvalStack currentThread state
 
@@ -1013,7 +885,6 @@ module NullaryIlOp =
 
             let state =
                 match referenced with
-                | CliType.RuntimePointer (CliRuntimePointer.Managed _)
                 | CliType.ObjectRef _ -> IlMachineState.pushToEvalStack referenced currentThread state
                 | _ -> failwith $"Unexpected non-reference {referenced}"
                 |> IlMachineState.advanceProgramCounter currentThread
@@ -1038,91 +909,19 @@ module NullaryIlOp =
                             (EvalStackValue.toCliTypeCoerced (CliType.ObjectRef None) value)
                             index
                     | ManagedPointerSource.Field _ -> failwith "TODO"
-                    | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "TODO"
                 | addr -> failwith $"TODO: {addr}"
 
             let state = state |> IlMachineState.advanceProgramCounter currentThread
 
             (state, WhatWeDid.Executed) |> ExecutionResult.Stepped
-        | Ldelem_i ->
-            let index, state = IlMachineState.popEvalStack currentThread state
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let value = getArrayElt index arr currentThread state
-
-            match value with
-            | CliType.Numeric (CliNumericType.NativeInt _) -> ()
-            | _ -> failwith "expected native int in Ldelem.i"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
-        | Ldelem_i1 ->
-            let index, state = IlMachineState.popEvalStack currentThread state
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let value = getArrayElt index arr currentThread state
-
-            failwith "TODO: we got back an int8; turn it into int32"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
+        | Ldelem_i -> failwith "TODO: Ldelem_i unimplemented"
+        | Ldelem_i1 -> failwith "TODO: Ldelem_i1 unimplemented"
         | Ldelem_u1 -> failwith "TODO: Ldelem_u1 unimplemented"
-        | Ldelem_i2 ->
-            let index, state = IlMachineState.popEvalStack currentThread state
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let value = getArrayElt index arr currentThread state
-
-            failwith "TODO: we got back an int16; turn it into int32"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
+        | Ldelem_i2 -> failwith "TODO: Ldelem_i2 unimplemented"
         | Ldelem_u2 -> failwith "TODO: Ldelem_u2 unimplemented"
-        | Ldelem_i4 ->
-            let index, state = IlMachineState.popEvalStack currentThread state
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let value = getArrayElt index arr currentThread state
-
-            match value with
-            | CliType.Numeric (CliNumericType.Int32 _) -> ()
-            | _ -> failwith "expected int32 in Ldelem.i4"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
+        | Ldelem_i4 -> failwith "TODO: Ldelem_i4 unimplemented"
         | Ldelem_u4 -> failwith "TODO: Ldelem_u4 unimplemented"
-        | Ldelem_i8 ->
-            let index, state = IlMachineState.popEvalStack currentThread state
-            let arr, state = IlMachineState.popEvalStack currentThread state
-
-            let value = getArrayElt index arr currentThread state
-
-            match value with
-            | CliType.Numeric (CliNumericType.Int64 _) -> ()
-            | _ -> failwith "expected int64 in Ldelem.i8"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
+        | Ldelem_i8 -> failwith "TODO: Ldelem_i8 unimplemented"
         | Ldelem_u8 -> failwith "TODO: Ldelem_u8 unimplemented"
         | Ldelem_r4 -> failwith "TODO: Ldelem_r4 unimplemented"
         | Ldelem_r8 -> failwith "TODO: Ldelem_r8 unimplemented"
@@ -1130,19 +929,7 @@ module NullaryIlOp =
             let index, state = IlMachineState.popEvalStack currentThread state
             let arr, state = IlMachineState.popEvalStack currentThread state
 
-            let value = getArrayElt index arr currentThread state
-
-            match value with
-            | CliType.ObjectRef _
-            | CliType.RuntimePointer _ -> ()
-            | _ -> failwith "expected object reference in Ldelem.ref"
-
-            let state =
-                state
-                |> IlMachineState.pushToEvalStack value currentThread
-                |> IlMachineState.advanceProgramCounter currentThread
-
-            ExecutionResult.Stepped (state, WhatWeDid.Executed)
+            ldElem (CliType.ObjectRef None) index arr currentThread state
         | Stelem_i ->
             let value, state = IlMachineState.popEvalStack currentThread state
             let index, state = IlMachineState.popEvalStack currentThread state

WoofWare.PawPrint/Program.fs

@@ -302,11 +302,6 @@ module Program =
 
         logger.LogInformation "Main method class now initialised"
 
-        let state =
-            { state with
-                ConcreteTypes = Corelib.concretizeAll state._LoadedAssemblies baseClassTypes state.ConcreteTypes
-            }
-
         // Now that BCL initialisation has taken place and the user-code classes are constructed,
         // overwrite the main thread completely using the already-concretized method.
         let methodState =

WoofWare.PawPrint/TypeHandleRegistry.fs

@@ -1,7 +1,5 @@
 namespace WoofWare.PawPrint
 
-open System.Collections.Immutable
-
 type TypeHandleRegistry =
     private
         {
@@ -19,10 +17,8 @@ module TypeHandleRegistry =
 
     /// Returns an allocated System.RuntimeType as well.
     let getOrAllocate
-        (allConcreteTypes : AllConcreteTypes)
-        (corelib : BaseClassTypes<DumpedAssembly>)
         (allocState : 'allocState)
-        (allocate : CliValueType -> 'allocState -> ManagedHeapAddress * 'allocState)
+        (allocate : CliField list -> 'allocState -> ManagedHeapAddress * 'allocState)
         (def : ConcreteTypeHandle)
         (reg : TypeHandleRegistry)
         : ManagedHeapAddress * TypeHandleRegistry * 'allocState
@@ -42,40 +38,17 @@ module TypeHandleRegistry =
                     Name = "m_keepalive"
                     Contents = CliType.ObjectRef None
                     Offset = None
-                    Type =
-                        AllConcreteTypes.findExistingConcreteType
-                            allConcreteTypes
-                            (corelib.Object.Assembly,
-                             corelib.Object.Namespace,
-                             corelib.Object.Name,
-                             ImmutableArray.Empty)
-                        |> Option.get
                 }
+                // TODO: this is actually a System.IntPtr https://github.com/dotnet/runtime/blob/ec11903827fc28847d775ba17e0cd1ff56cfbc2e/src/coreclr/nativeaot/Runtime.Base/src/System/Primitives.cs#L339
                 {
                     Name = "m_cache"
                     Contents = CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.Verbatim 0L))
                     Offset = None
-                    Type =
-                        AllConcreteTypes.findExistingConcreteType
-                            allConcreteTypes
-                            (corelib.IntPtr.Assembly,
-                             corelib.IntPtr.Namespace,
-                             corelib.IntPtr.Name,
-                             ImmutableArray.Empty)
-                        |> Option.get
                 }
                 {
                     Name = "m_handle"
                     Contents = CliType.Numeric (CliNumericType.NativeInt (NativeIntSource.TypeHandlePtr def))
                     Offset = None
-                    Type =
-                        AllConcreteTypes.findExistingConcreteType
-                            allConcreteTypes
-                            (corelib.IntPtr.Assembly,
-                             corelib.IntPtr.Namespace,
-                             corelib.IntPtr.Name,
-                             ImmutableArray.Empty)
-                        |> Option.get
                 }
                 // This is the const -1, apparently?!
                 // https://github.com/dotnet/runtime/blob/f0168ee80ba9aca18a7e7140b2bb436defda623c/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs#L2496
@@ -83,14 +56,8 @@ module TypeHandleRegistry =
                     Name = "GenericParameterCountAny"
                     Contents = CliType.Numeric (CliNumericType.Int32 -1)
                     Offset = None
-                    Type =
-                        AllConcreteTypes.findExistingConcreteType
-                            allConcreteTypes
-                            (corelib.Int32.Assembly, corelib.Int32.Namespace, corelib.Int32.Name, ImmutableArray.Empty)
-                        |> Option.get
                 }
             ]
-            |> CliValueType.OfFields Layout.Default
 
         let alloc, state = allocate fields allocState
 

WoofWare.PawPrint/UnaryMetadataIlOp.fs

@@ -296,7 +296,7 @@ module internal UnaryMetadataIlOp =
                 ((state, []), instanceFields)
                 ||> List.fold (fun (state, zeros) field ->
                     // TODO: generics
-                    let state, zero, concreteType =
+                    let state, zero =
                         IlMachineState.cliTypeZeroOf
                             loggerFactory
                             baseClassTypes
@@ -311,13 +311,12 @@ module internal UnaryMetadataIlOp =
                             Name = field.Name
                             Contents = zero
                             Offset = field.Offset
-                            Type = concreteType
                         }
 
                     state, field :: zeros
                 )
 
-            let fields = List.rev fieldZeros |> CliValueType.OfFields ctorType.Layout
+            let fields = List.rev fieldZeros
 
             // Note: this is a bit unorthodox for value types, which *aren't* heap-allocated.
             // We'll perform their construction on the heap, though, to keep the interface
@@ -396,7 +395,7 @@ module internal UnaryMetadataIlOp =
                         ref
                 | x -> failwith $"TODO: Newarr element type resolution unimplemented for {x}"
 
-            let state, zeroOfType, concreteTypeHandle =
+            let state, zeroOfType =
                 IlMachineState.cliTypeZeroOf
                     loggerFactory
                     baseClassTypes
@@ -416,55 +415,7 @@ module internal UnaryMetadataIlOp =
                 |> IlMachineState.advanceProgramCounter thread
 
             state, WhatWeDid.Executed
-        | Box ->
-            let state, ty, assy =
-                match metadataToken with
-                | MetadataToken.TypeDefinition h ->
-                    let state, ty = IlMachineState.lookupTypeDefn baseClassTypes state activeAssy h
-                    state, ty, activeAssy
-                | MetadataToken.TypeReference ref ->
-                    IlMachineState.lookupTypeRef
-                        loggerFactory
-                        baseClassTypes
-                        state
-                        activeAssy
-                        currentMethod.DeclaringType.Generics
-                        ref
-                | MetadataToken.TypeSpecification spec -> state, activeAssy.TypeSpecs.[spec].Signature, activeAssy
-                | _ -> failwith $"unexpected token {metadataToken} in Box"
-
-            let state, typeHandle =
-                IlMachineState.concretizeType
-                    loggerFactory
-                    baseClassTypes
-                    state
-                    assy.Name
-                    currentMethod.DeclaringType.Generics
-                    currentMethod.Generics
-                    ty
-
-            let toBox, state = state |> IlMachineState.popEvalStack thread
-
-            let targetType =
-                AllConcreteTypes.lookup typeHandle state.ConcreteTypes |> Option.get
-
-            let defn =
-                state._LoadedAssemblies.[targetType.Assembly.FullName].TypeDefs.[targetType.Definition.Get]
-
-            let baseType =
-                DumpedAssembly.resolveBaseType baseClassTypes state._LoadedAssemblies targetType.Assembly defn.BaseType
-
-            let toPush =
-                match baseType with
-                | ResolvedBaseType.Enum
-                | ResolvedBaseType.ValueType -> failwith "TODO: implement Box"
-                | ResolvedBaseType.Object
-                | ResolvedBaseType.Delegate -> toBox
-
-            state
-            |> IlMachineState.pushToEvalStack' toPush thread
-            |> IlMachineState.advanceProgramCounter thread
-            |> Tuple.withRight WhatWeDid.Executed
+        | Box -> failwith "TODO: Box unimplemented"
         | Ldelema ->
             let index, state = IlMachineState.popEvalStack thread state
             let arr, state = IlMachineState.popEvalStack thread state
@@ -547,8 +498,7 @@ module internal UnaryMetadataIlOp =
                         if v.ConcreteType = targetConcreteType then
                             actualObj
                         else
-                            failwith
-                                $"TODO: is {AllConcreteTypes.lookup v.ConcreteType state.ConcreteTypes |> Option.get} an instance of {AllConcreteTypes.lookup targetConcreteType state.ConcreteTypes |> Option.get}"
+                            failwith $"TODO: is {v.ConcreteType} an instance of {targetType} ({targetConcreteType})"
                     | false, _ ->
 
                     match state.ManagedHeap.Arrays.TryGetValue addr with
@@ -591,7 +541,7 @@ module internal UnaryMetadataIlOp =
                 logger.LogInformation (
                     "Storing in object field {FieldAssembly}.{FieldDeclaringType}.{FieldName} (type {FieldType})",
                     field.DeclaringType.Assembly.Name,
-                    field.DeclaringType.Name,
+                    field.Name,
                     field.Name,
                     field.Signature
                 )
@@ -602,7 +552,7 @@ module internal UnaryMetadataIlOp =
             let state, declaringTypeHandle, typeGenerics =
                 IlMachineState.concretizeFieldForExecution loggerFactory baseClassTypes thread field state
 
-            let state, zero, concreteTypeHandle =
+            let state, zero =
                 IlMachineState.cliTypeZeroOf
                     loggerFactory
                     baseClassTypes
@@ -632,7 +582,20 @@ module internal UnaryMetadataIlOp =
                     match state.ManagedHeap.NonArrayObjects.TryGetValue addr with
                     | false, _ -> failwith $"todo: array {addr}"
                     | true, v ->
-                        let v = AllocatedNonArrayObject.SetField field.Name valueToStore v
+                        let v =
+                            { v with
+                                Fields =
+                                    v.Fields
+                                    |> List.replaceWhere (fun f ->
+                                        if f.Name = field.Name then
+                                            { f with
+                                                Contents = valueToStore
+                                            }
+                                            |> Some
+                                        else
+                                            None
+                                    )
+                            }
 
                         let heap =
                             { state.ManagedHeap with
@@ -661,7 +624,6 @@ module internal UnaryMetadataIlOp =
                     state |> IlMachineState.setArrayValue arr newValue index
                 | EvalStackValue.ManagedPointer (ManagedPointerSource.Field (managedPointerSource, fieldName)) ->
                     failwith "todo"
-                | EvalStackValue.ManagedPointer (ManagedPointerSource.InterpretedAsType (src, ty)) -> failwith "todo"
                 | EvalStackValue.UserDefinedValueType _ -> failwith "todo"
 
             state
@@ -718,7 +680,7 @@ module internal UnaryMetadataIlOp =
 
             let popped, state = IlMachineState.popEvalStack thread state
 
-            let state, zero, concreteTypeHandle =
+            let state, zero =
                 IlMachineState.cliTypeZeroOf
                     loggerFactory
                     baseClassTypes
@@ -785,7 +747,7 @@ module internal UnaryMetadataIlOp =
                     match IlMachineState.getStatic declaringTypeHandle field.Name state with
                     | Some v -> state, v
                     | None ->
-                        let state, zero, concreteTypeHandle =
+                        let state, zero =
                             IlMachineState.cliTypeZeroOf
                                 loggerFactory
                                 baseClassTypes
@@ -827,7 +789,7 @@ module internal UnaryMetadataIlOp =
                     | false, _ -> failwith $"todo: array {managedHeapAddress}"
                     | true, v ->
                         IlMachineState.pushToEvalStack
-                            (AllocatedNonArrayObject.DereferenceField field.Name v)
+                            (v.Fields |> List.find (fun f -> field.Name = f.Name) |> _.Contents)
                             thread
                             state
                 | EvalStackValue.ManagedPointer (ManagedPointerSource.ArrayIndex (arr, index)) ->
@@ -842,11 +804,10 @@ module internal UnaryMetadataIlOp =
                         IlMachineState.getFieldValue src fieldName state |> CliType.getField field.Name
 
                     IlMachineState.pushToEvalStack currentValue thread state
-                | EvalStackValue.ManagedPointer (ManagedPointerSource.InterpretedAsType (src, ty)) -> failwith "TODO"
                 | EvalStackValue.UserDefinedValueType vt ->
-                    let result = vt |> CliValueType.DereferenceField field.Name
+                    let result = vt |> EvalStackValueUserType.DereferenceField field.Name
 
-                    IlMachineState.pushToEvalStack result thread state
+                    IlMachineState.pushToEvalStack' result thread state
 
             state
             |> IlMachineState.advanceProgramCounter thread
@@ -950,7 +911,7 @@ module internal UnaryMetadataIlOp =
             let fieldValue, state =
                 match IlMachineState.getStatic declaringTypeHandle field.Name state with
                 | None ->
-                    let state, newVal, concreteTypeHandle =
+                    let state, newVal =
                         IlMachineState.cliTypeZeroOf
                             loggerFactory
                             baseClassTypes
@@ -1028,7 +989,7 @@ module internal UnaryMetadataIlOp =
             let elementType =
                 DumpedAssembly.typeInfoToTypeDefn baseClassTypes state._LoadedAssemblies elementType
 
-            let state, zeroOfType, concreteTypeHandle =
+            let state, zeroOfType =
                 IlMachineState.cliTypeZeroOf
                     loggerFactory
                     baseClassTypes
@@ -1125,7 +1086,7 @@ module internal UnaryMetadataIlOp =
                 targetType
                 |> DumpedAssembly.typeInfoToTypeDefn baseClassTypes state._LoadedAssemblies
 
-            let state, zeroOfType, concreteTypeHandle =
+            let state, zeroOfType =
                 IlMachineState.cliTypeZeroOf
                     loggerFactory
                     baseClassTypes
@@ -1153,7 +1114,6 @@ module internal UnaryMetadataIlOp =
                     | ManagedPointerSource.Field (managedPointerSource, fieldName) ->
                         state |> IlMachineState.setFieldValue managedPointerSource zeroOfType fieldName
                     | ManagedPointerSource.Null -> failwith "runtime error: unexpectedly Initobj'ing null"
-                    | ManagedPointerSource.InterpretedAsType (src, ty) -> failwith "TODO"
                     | ManagedPointerSource.Heap _ -> failwith "logic error"
                 | EvalStackValue.UserDefinedValueType evalStackValueUserType -> failwith "todo"
 
@@ -1182,31 +1142,30 @@ module internal UnaryMetadataIlOp =
             | FirstLoadThis state -> state, WhatWeDid.SuspendedForClassInit
             | NothingToDo state ->
 
-            // TODO: if field type is unmanaged, push an unmanaged pointer
-            // TODO: Note that field may be a static global with an assigned relative virtual address
-            // (the offset of the field from the base address at which its containing PE file is loaded into memory)
-            // where the memory is unmanaged.
-            match IlMachineState.getStatic declaringTypeHandle field.Name state with
-            | Some v ->
-                IlMachineState.pushToEvalStack v thread state
-                |> IlMachineState.advanceProgramCounter thread
-                |> Tuple.withRight WhatWeDid.Executed
-            | None ->
-                // Field is not yet initialised
-                let state, zero, concreteTypeHandle =
-                    IlMachineState.cliTypeZeroOf
-                        loggerFactory
-                        baseClassTypes
-                        activeAssy
-                        field.Signature
-                        typeGenerics
-                        ImmutableArray.Empty // field can't have its own generics
-                        state
+            if TypeDefn.isManaged field.Signature then
+                match IlMachineState.getStatic declaringTypeHandle field.Name state with
+                | Some v ->
+                    IlMachineState.pushToEvalStack v thread state
+                    |> IlMachineState.advanceProgramCounter thread
+                    |> Tuple.withRight WhatWeDid.Executed
+                | None ->
+                    // Field is not yet initialised
+                    let state, zero =
+                        IlMachineState.cliTypeZeroOf
+                            loggerFactory
+                            baseClassTypes
+                            activeAssy
+                            field.Signature
+                            typeGenerics
+                            ImmutableArray.Empty // field can't have its own generics
+                            state
 
-                IlMachineState.setStatic declaringTypeHandle field.Name zero state
-                |> IlMachineState.pushToEvalStack (CliType.ObjectRef None) thread
-                |> IlMachineState.advanceProgramCounter thread
-                |> Tuple.withRight WhatWeDid.Executed
+                    IlMachineState.setStatic declaringTypeHandle field.Name zero state
+                    |> IlMachineState.pushToEvalStack (CliType.ObjectRef None) thread
+                    |> IlMachineState.advanceProgramCounter thread
+                    |> Tuple.withRight WhatWeDid.Executed
+            else
+                failwith "TODO: Ldsflda - push unmanaged pointer"
 
         | Ldftn ->
             let method, methodGenerics =
@@ -1288,17 +1247,9 @@ module internal UnaryMetadataIlOp =
                         Name = "m_type"
                         Contents = CliType.ObjectRef (Some alloc)
                         Offset = None
-                        Type =
-                            AllConcreteTypes.findExistingConcreteType
-                                state.ConcreteTypes
-                                (baseClassTypes.Object.Assembly,
-                                 baseClassTypes.Object.Namespace,
-                                 baseClassTypes.Object.Name,
-                                 ImmutableArray.Empty)
-                            |> Option.get
                     }
                     |> List.singleton
-                    |> CliValueType.OfFields Layout.Default
+                    |> CliValueType.OfFields
 
                 IlMachineState.pushToEvalStack (CliType.ValueType vt) thread state
 
@@ -1355,17 +1306,9 @@ module internal UnaryMetadataIlOp =
                             Name = "m_type"
                             Contents = CliType.ObjectRef (Some alloc)
                             Offset = None
-                            Type =
-                                AllConcreteTypes.findExistingConcreteType
-                                    state.ConcreteTypes
-                                    (baseClassTypes.Object.Assembly,
-                                     baseClassTypes.Object.Namespace,
-                                     baseClassTypes.Object.Name,
-                                     ImmutableArray.Empty)
-                                |> Option.get
                         }
                         |> List.singleton
-                        |> CliValueType.OfFields Layout.Default
+                        |> CliValueType.OfFields
 
                     IlMachineState.pushToEvalStack (CliType.ValueType vt) thread state
                 | MetadataToken.TypeReference h ->
@@ -1400,17 +1343,9 @@ module internal UnaryMetadataIlOp =
                             Name = "m_type"
                             Contents = CliType.ObjectRef (Some alloc)
                             Offset = None
-                            Type =
-                                AllConcreteTypes.findExistingConcreteType
-                                    state.ConcreteTypes
-                                    (baseClassTypes.Object.Assembly,
-                                     baseClassTypes.Object.Namespace,
-                                     baseClassTypes.Object.Name,
-                                     ImmutableArray.Empty)
-                                |> Option.get
                         }
                         |> List.singleton
-                        |> CliValueType.OfFields Layout.Default
+                        |> CliValueType.OfFields
 
                     IlMachineState.pushToEvalStack (CliType.ValueType vt) thread state
                 | MetadataToken.TypeDefinition h ->
@@ -1424,70 +1359,7 @@ module internal UnaryMetadataIlOp =
             |> IlMachineState.advanceProgramCounter thread
             |> Tuple.withRight WhatWeDid.Executed
         | Cpobj -> failwith "TODO: Cpobj unimplemented"
-        | Ldobj ->
-            let state, ty, assy =
-                match metadataToken with
-                | MetadataToken.TypeDefinition h ->
-                    let state, ty = IlMachineState.lookupTypeDefn baseClassTypes state activeAssy h
-                    state, ty, activeAssy
-                | MetadataToken.TypeReference ref ->
-                    IlMachineState.lookupTypeRef
-                        loggerFactory
-                        baseClassTypes
-                        state
-                        activeAssy
-                        currentMethod.DeclaringType.Generics
-                        ref
-                | MetadataToken.TypeSpecification spec -> state, activeAssy.TypeSpecs.[spec].Signature, activeAssy
-                | _ -> failwith $"unexpected token {metadataToken} in Ldobj"
-
-            let state, typeHandle =
-                IlMachineState.concretizeType
-                    loggerFactory
-                    baseClassTypes
-                    state
-                    assy.Name
-                    currentMethod.DeclaringType.Generics
-                    currentMethod.Generics
-                    ty
-
-            let addr, state = state |> IlMachineState.popEvalStack thread
-
-            let obj =
-                match addr with
-                | EvalStackValue.ObjectRef addr ->
-                    IlMachineState.dereferencePointer state (ManagedPointerSource.Heap addr)
-                | EvalStackValue.ManagedPointer ptr -> IlMachineState.dereferencePointer state ptr
-                | EvalStackValue.Float _
-                | EvalStackValue.Int64 _
-                | EvalStackValue.Int32 _ -> failwith "refusing to interpret constant as address"
-                | _ -> failwith "TODO"
-
-            let targetType =
-                AllConcreteTypes.lookup typeHandle state.ConcreteTypes |> Option.get
-
-            let defn =
-                state._LoadedAssemblies.[targetType.Assembly.FullName].TypeDefs.[targetType.Definition.Get]
-
-            let baseType =
-                DumpedAssembly.resolveBaseType baseClassTypes state._LoadedAssemblies targetType.Assembly defn.BaseType
-
-            let toPush =
-                match baseType with
-                | ResolvedBaseType.Enum
-                | ResolvedBaseType.ValueType ->
-                    failwith
-                        $"TODO: push %O{obj} as type %s{targetType.Assembly.Name}.%s{targetType.Namespace}.%s{targetType.Name}"
-                | ResolvedBaseType.Object
-                | ResolvedBaseType.Delegate ->
-                    // III.4.13: reference types are just copied as pointers.
-                    // We should have received a pointer, so let's just pass it back.
-                    obj
-
-            state
-            |> IlMachineState.pushToEvalStack toPush thread
-            |> IlMachineState.advanceProgramCounter thread
-            |> Tuple.withRight WhatWeDid.Executed
+        | Ldobj -> failwith "TODO: Ldobj unimplemented"
         | Sizeof ->
             let state, ty, assy =
                 match metadataToken with
@@ -1502,7 +1374,6 @@ module internal UnaryMetadataIlOp =
                         activeAssy
                         currentMethod.DeclaringType.Generics
                         ref
-                | MetadataToken.TypeSpecification spec -> state, activeAssy.TypeSpecs.[spec].Signature, activeAssy
                 | _ -> failwith $"unexpected token {metadataToken} in Sizeof"
 
             let state, typeHandle =

WoofWare.PawPrint/UnaryStringTokenIlOp.fs

@@ -56,30 +56,13 @@ module internal UnaryStringTokenIlOp =
                                 Name = "_firstChar"
                                 Contents = CliType.ofChar state.ManagedHeap.StringArrayData.[dataAddr]
                                 Offset = None
-                                Type =
-                                    AllConcreteTypes.findExistingConcreteType
-                                        state.ConcreteTypes
-                                        (baseClassTypes.Char.Assembly,
-                                         baseClassTypes.Char.Namespace,
-                                         baseClassTypes.Char.Name,
-                                         ImmutableArray.Empty)
-                                    |> Option.get
                             }
                             {
                                 Name = "_stringLength"
                                 Contents = CliType.Numeric (CliNumericType.Int32 stringToAllocate.Length)
                                 Offset = None
-                                Type =
-                                    AllConcreteTypes.findExistingConcreteType
-                                        state.ConcreteTypes
-                                        (baseClassTypes.Int32.Assembly,
-                                         baseClassTypes.Int32.Namespace,
-                                         baseClassTypes.Int32.Name,
-                                         ImmutableArray.Empty)
-                                    |> Option.get
                             }
                         ]
-                        |> CliValueType.OfFields Layout.Default
 
                     let state, stringType =
                         DumpedAssembly.typeInfoToTypeDefn' baseClassTypes state._LoadedAssemblies baseClassTypes.String

WoofWare.PawPrint/WoofWare.PawPrint.fsproj

@@ -10,6 +10,7 @@
     <Compile Include="List.fs" />
     <Compile Include="ImmutableArray.fs" />
     <Compile Include="Result.fs" />
+    <Compile Include="Constants.fs" />
     <Compile Include="Corelib.fs" />
     <Compile Include="AbstractMachineDomain.fs" />
     <Compile Include="BasicCliType.fs" />
@@ -20,10 +21,10 @@
     <Compile Include="Exceptions.fs" />
     <Compile Include="EvalStack.fs" />
     <Compile Include="EvalStackValueComparisons.fs" />
+    <Compile Include="BinaryArithmetic.fs" />
     <Compile Include="MethodState.fs" />
     <Compile Include="ThreadState.fs" />
     <Compile Include="IlMachineState.fs" />
-    <Compile Include="BinaryArithmetic.fs" />
     <Compile Include="Intrinsics.fs" />
     <Compile Include="IlMachineStateExecution.fs" />
     <Compile Include="NullaryIlOp.fs" />

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759036355,
-        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "lastModified": 1755736253,
+        "narHash": "sha256-jlIQRypNhB1PcB1BE+expE4xZeJxzoAGr1iUbHQta8s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "rev": "596312aae91421d6923f18cecce934a7d3bfd6b8",
         "type": "github"
       },
       "original": {

flake.nix

@@ -17,8 +17,8 @@
         config.allowUnfree = true;
       };
       pname = "WoofWare.PawPrint";
-      dotnet-sdk = pkgs.dotnetCorePackages.sdk_10_0;
-      dotnet-runtime = pkgs.dotnetCorePackages.runtime_10_0;
+      dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0;
+      dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0;
       version = "0.1";
       dotnetTool = dllOverride: toolName: toolVersion: hash:
         pkgs.stdenvNoCC.mkDerivation rec {