add preliminary InterpreterExecutionStrategy class (dotnet#5011)

tonerdo · May 21, 2018 · 4288c17 · 4288c17
1 parent dcb70d3
commit 4288c17
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/...stem.Private.Interpreter/src/Internal/Runtime/Interpreter/InterpreterExecutionStrategy.cs b/...stem.Private.Interpreter/src/Internal/Runtime/Interpreter/InterpreterExecutionStrategy.cs
@@ -0,0 +1,13 @@
+using System;
+using Internal.Runtime.TypeLoader;
+
+namespace Internal.Runtime.Interpreter
+{
+    class InterpreterExecutionStrategy : MethodExecutionStrategy
+    {
+        public override IntPtr OnEntryPoint(MethodEntrypointPtr entrypointInfo, IntPtr callerArgumentsInfo)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/System.Private.Interpreter/src/System.Private.Interpreter.csproj b/src/System.Private.Interpreter/src/System.Private.Interpreter.csproj
@@ -5,15 +5,18 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <InterpreterSupport>true</InterpreterSupport>
+    <EcmaMetadataSupport>true</EcmaMetadataSupport>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj">
-      <Aliases>global,System_Private_CoreLib</Aliases>
-    </ProjectReference>
+    <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" />
+    <ProjectReference Include="..\..\System.Private.Reflection.Metadata\src\System.Private.Reflection.Metadata.csproj" />
     <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Internal\Runtime\Interpreter\MethodCallInterceptor.cs" />
+    <Compile Include="Internal\Runtime\Interpreter\ILInterpreter.cs" />
+    <Compile Include="Internal\Runtime\Interpreter\InterpreterCallInterceptor.cs" />
+    <Compile Include="Internal\Runtime\Interpreter\InterpreterExecutionStrategy.cs" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/...oader/JitSupport.MethodEntrypointStubs.cs → ...ntime/TypeLoader/MethodEntrypointStubs.cs b/...oader/JitSupport.MethodEntrypointStubs.cs → ...ntime/TypeLoader/MethodEntrypointStubs.cs
diff --git a/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj b/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj
@@ -56,7 +56,7 @@
   <PropertyGroup>
     <NativeFormatCommonPath>..\..\Common\src\Internal\NativeFormat</NativeFormatCommonPath>
   </PropertyGroup>
-  <ItemGroup Condition="'$(JitSupport)' == 'true'">
+  <ItemGroup Condition="'$(JitSupport)' == 'true' or '$(InterpreterSupport)' == 'true'">
     <Compile Include="..\..\Common\src\TypeSystem\CodeGen\TypeDesc.CodeGen.cs" />
     <Compile Include="..\..\Common\src\TypeSystem\RuntimeDetermined\ArrayType.RuntimeDetermined.cs" />
     <Compile Include="..\..\Common\src\TypeSystem\RuntimeDetermined\ByRefType.RuntimeDetermined.cs" />
@@ -93,7 +93,7 @@
     <Compile Include="..\..\Common\src\TypeSystem\IL\TypeSystemContext.GeneratedAssembly.cs" />
     <Compile Include="Internal\TypeSystem\ILStubMethod.Runtime.cs" />
     <Compile Include="Internal\TypeSystem\MethodForRuntimeDeterminedType.Runtime.cs" />
-    <Compile Include="Internal\Runtime\TypeLoader\JitSupport.MethodEntrypointStubs.cs" />
+    <Compile Include="Internal\Runtime\TypeLoader\MethodEntrypointStubs.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(EcmaMetadataSupport)' == 'true'" >
     <Compile Include="System\Reflection\Runtime\General\QHandles.Ecma.cs" />