Separate code manager for the interpreter

This change adds a separate code manager for the interpreted code. Here
is an overview of the changes:
* A base class EECodeGenManager is extracted from the EEJitManager
* A new class InterpreterJitManager derived from the EECodeGenManager is
  added and implemented.
* Similarly, a base class CEECodeGenInfo is extracted from the CEEJitInfo
* A new class CInterpreterJitInfo derived from the CEECodeGenInfo is added
  and implemented
* The CodeHeader and RealCodeHeader became base classes and
  JitCodeHeader, RealJitCodeHeader, InterpreterCodeHeader and
  RealInterpreterCodeHeader were added. The CodeHeader derivates don't
  add any extra data, the JitCodeHeader just provides the methods that
  are needed to access Jit specific members of the RealJitCodeHeader.
* The UnsafeJitFunction is refactored so that the interpreter (if
  enabled) is invoked first and then the AltJit / Jit ones are called.
* A new DOTNET_Interpreter, DOTNET_InterpreterPath and
  DOTNET_InterpreterName env vars are added to match the existing AltJit
  ones.

Author: janvorli

src/coreclr/debug/daccess/fntableaccess.cpp

@@ -137,7 +137,7 @@ static NTSTATUS OutOfProcessFindHeader(ReadMemoryFunction fpReadMemory,PVOID pUs
     return STATUS_SUCCESS;
 }
 
-#define CODE_HEADER FakeRealCodeHeader
+#define CODE_HEADER FakeJitRealCodeHeader
 #define ResolveCodeHeader(pHeader)                          \
     if (pHeader)                                            \
     {                                                       \
@@ -169,7 +169,7 @@ extern "C" NTSTATUS OutOfProcessFunctionTableCallbackEx(IN  ReadMemoryFunction
     *ppFunctions = 0;
     *pnEntries   = 0;
 
-    DWORD_PTR  pHp = JitMan + (DWORD_PTR)offsetof(FakeEEJitManager, m_pCodeHeap);
+    DWORD_PTR  pHp = JitMan + (DWORD_PTR)offsetof(FakeEECodeGenManager, m_pCodeHeap);
 
     move(pHp, pHp);
 

src/coreclr/debug/daccess/fntableaccess.h

@@ -11,7 +11,7 @@
 #define _FN_TABLE_ACCESS_H
 
 
-struct FakeEEJitManager
+struct FakeEECodeGenManager
 {
     LPVOID      __VFN_table;
     LPVOID      m_runtimeSupport;
@@ -55,7 +55,7 @@ typedef struct _FakeHpRealCodeHdr
     LPVOID              hdrMDesc;       // changed from MethodDesc*
     DWORD               nUnwindInfos;
     T_RUNTIME_FUNCTION  unwindInfos[0];
-} FakeRealCodeHeader;
+} FakeJitRealCodeHeader;
 
 typedef struct _FakeHpCodeHdr
 {
@@ -76,7 +76,7 @@ class CheckDuplicatedStructLayouts
 {
 #define CHECK_OFFSET(cls, fld) CPP_ASSERT(cls##fld, offsetof(Fake##cls, fld) == offsetof(cls, fld))
 
-    CHECK_OFFSET(EEJitManager, m_pCodeHeap);
+    CHECK_OFFSET(EECodeGenManager, m_pCodeHeap);
 
     CHECK_OFFSET(HeapList, hpNext);
     CHECK_OFFSET(HeapList, startAddress);
@@ -85,8 +85,8 @@ class CheckDuplicatedStructLayouts
     CHECK_OFFSET(HeapList, pHdrMap);
 
 #if !defined(TARGET_X86)
-    CHECK_OFFSET(RealCodeHeader,    nUnwindInfos);
-    CHECK_OFFSET(RealCodeHeader,    unwindInfos);
+    CHECK_OFFSET(JitRealCodeHeader,    nUnwindInfos);
+    CHECK_OFFSET(JitRealCodeHeader,    unwindInfos);
 #endif  // !TARGET_X86
 
 #undef CHECK_OFFSET

src/coreclr/inc/clrconfigvalues.h

@@ -324,6 +324,12 @@ RETAIL_CONFIG_STRING_INFO(EXTERNAL_AltJitOs, W("AltJitOS"), "Sets target OS for
 RETAIL_CONFIG_STRING_INFO(EXTERNAL_AltJitExcludeAssemblies, W("AltJitExcludeAssemblies"), "Do not use AltJit on this semicolon-delimited list of assemblies.")
 #endif // defined(ALLOW_SXS_JIT)
 
+#ifdef FEATURE_INTERPRETER
+RETAIL_CONFIG_STRING_INFO(EXTERNAL_InterpreterName, W("InterpreterName"), "Primary interpreter to use")
+CONFIG_STRING_INFO(INTERNAL_InterpreterPath, W("InterpreterPath"), "Full path to the interpreter to use")
+RETAIL_CONFIG_STRING_INFO(EXTERNAL_Interpreter, W("Interpreter"), "Enables Interpreter and selectively limits it to the specified methods.")
+#endif // FEATURE_INTERPRETER
+
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_JitHostMaxSlabCache, W("JitHostMaxSlabCache"), 0x1000000, "Sets jit host max slab cache size, 16MB default")
 
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_JitOptimizeType, W("JitOptimizeType"), 0 /* OPT_DEFAULT */, "")

src/coreclr/inc/corjit.h

@@ -52,6 +52,7 @@ enum CorJitAllocMemFlag
     CORJIT_ALLOCMEM_FLG_32BYTE_ALIGN   = 0x00000004, // The code will be 32-byte aligned
     CORJIT_ALLOCMEM_FLG_RODATA_32BYTE_ALIGN = 0x00000008, // The read-only data will be 32-byte aligned
     CORJIT_ALLOCMEM_FLG_RODATA_64BYTE_ALIGN = 0x00000010, // The read-only data will be 64-byte aligned
+    CORJIT_ALLOCMEM_FLG_INTERPRETED = 0x00000020,         // The code is interpreted byte code
 };
 
 inline CorJitAllocMemFlag operator |(CorJitAllocMemFlag a, CorJitAllocMemFlag b)

src/coreclr/inc/dacvars.h

@@ -84,6 +84,9 @@ DEFINE_DACVAR(PTR_EEJitManager, ExecutionManager__m_pEEJitManager, ExecutionMana
 #ifdef FEATURE_READYTORUN
 DEFINE_DACVAR(PTR_ReadyToRunJitManager, ExecutionManager__m_pReadyToRunJitManager, ExecutionManager::m_pReadyToRunJitManager)
 #endif
+#ifdef FEATURE_INTERPRETER
+DEFINE_DACVAR(PTR_InterpreterJitManager, ExecutionManager__m_pInterpreterJitManager, ExecutionManager::m_pInterpreterJitManager)
+#endif
 
 DEFINE_DACVAR_NO_DUMP(VMHELPDEF *, dac__hlpFuncTable, ::hlpFuncTable)
 DEFINE_DACVAR(VMHELPDEF *, dac__hlpDynamicFuncTable, ::hlpDynamicFuncTable)

src/coreclr/inc/vptr_list.h

@@ -9,6 +9,9 @@ VPTR_CLASS(EEJitManager)
 #ifdef FEATURE_READYTORUN
 VPTR_CLASS(ReadyToRunJitManager)
 #endif
+#ifdef FEATURE_INTERPRETER
+VPTR_CLASS(InterpreterJitManager)
+#endif
 VPTR_CLASS(EECodeManager)
 
 VPTR_CLASS(RangeList)

src/coreclr/interpreter/eeinterp.cpp

@@ -52,7 +52,7 @@ CorJitResult CILInterp::compileMethod(ICorJitInfo*         compHnd,
 
     // TODO: replace this by something like the JIT does to support multiple methods being specified and we don't
     // keep fetching it on each call to compileMethod
-    const char *methodToInterpret = g_interpHost->getStringConfigValue("AltJit");
+    const char *methodToInterpret = g_interpHost->getStringConfigValue("Interpreter");
     bool doInterpret = (methodName != NULL && strcmp(methodName, methodToInterpret) == 0);
     g_interpHost->freeStringConfigValue(methodToInterpret);
 
@@ -72,23 +72,18 @@ CorJitResult CILInterp::compileMethod(ICorJitInfo*         compHnd,
 
     uint32_t sizeOfCode = sizeof(InterpMethod*) + IRCodeSize * sizeof(int32_t);
 
-    // TODO: get rid of the need to allocate fake unwind info.
-    compHnd->reserveUnwindInfo(false /* isFunclet */, false /* isColdCode */ , 8 /* unwindSize */);
     AllocMemArgs args;
     args.hotCodeSize = sizeOfCode;
     args.coldCodeSize = 0;
     args.roDataSize = 0;
     args.xcptnsCount = 0;
-    args.flag = CORJIT_ALLOCMEM_DEFAULT_CODE_ALIGN;
+    args.flag = CORJIT_ALLOCMEM_DEFAULT_CODE_ALIGN | CORJIT_ALLOCMEM_FLG_INTERPRETED;
     compHnd->allocMem(&args);
 
     // We store first the InterpMethod pointer as the code header, followed by the actual code
     *(InterpMethod**)args.hotCodeBlockRW = pMethod;
     memcpy ((uint8_t*)args.hotCodeBlockRW + sizeof(InterpMethod*), pIRCode, IRCodeSize * sizeof(int32_t));
 
-    // TODO: get rid of the need to allocate fake unwind info
-    compHnd->allocUnwindInfo((uint8_t*)args.hotCodeBlock, (uint8_t*)args.coldCodeBlock, 0, 1, 0, nullptr, CORJIT_FUNC_ROOT);
-
     *entryAddress = (uint8_t*)args.hotCodeBlock;
     *nativeSizeOfCode = sizeOfCode;