#if COR_JIT_EE_VERSION > 460
// Update this one
-SELECTANY const GUID JITEEVersionIdentifier = { /* 13accf3d-12d7-4fd4-bc65-d73578b1a474 */
- 0x13accf3d,
- 0x12d7,
- 0x4fd4,
- { 0xbc, 0x65, 0xd7, 0x35, 0x78, 0xb1, 0xa4, 0x74 }
+SELECTANY const GUID JITEEVersionIdentifier = { /* 35ef98ab-fd22-4ccc-8ddb-b1156a7d94f3 */
+ 0x35ef98ab,
+ 0xfd22,
+ 0x4ccc,
+ { 0x8d, 0xdb, 0xb1, 0x15, 0x6a, 0x7d, 0x94, 0xf3 }
};
#else
/* OUT */ SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR* structPassInRegDescPtr
) = 0;
- /*************************************************************************/
- //
- // Configuration values - Allows querying of the CLR configuration.
- //
- /*************************************************************************/
-
- // Return an integer ConfigValue if any.
- //
- virtual int getIntConfigValue(
- const wchar_t *name,
- int defaultValue
- ) = 0;
-
- // Return a string ConfigValue if any.
- //
- virtual wchar_t *getStringConfigValue(
- const wchar_t *name
- ) = 0;
-
- // Free a string ConfigValue returned by the runtime.
- // JITs using the getStringConfigValue query are required
- // to return the string values to the runtime for deletion.
- // this avoid leaking the memory in the JIT.
- virtual void freeStringConfigValue(
- __in_z wchar_t *value
- ) = 0;
-
#endif // COR_JIT_EE_VERSION
};
};
#endif
+#if COR_JIT_EE_VERSION > 460
+
+#include "corjithost.h"
+
+extern "C" void __stdcall jitStartup(ICorJitHost* host);
+
+#endif
+
class ICorJitCompiler;
class ICorJitInfo;
-
struct IEEMemoryManager;
extern "C" ICorJitCompiler* __stdcall getJit();
--- /dev/null
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#ifndef __CORJITHOST_H__
+#define __CORJITHOST_H__
+
+// ICorJitHost
+//
+// ICorJitHost provides the interface that the JIT uses to access some functionality that
+// would normally be provided by the operating system. This is intended to allow for
+// host-specific policies re: memory allocation, configuration value access, etc. It is
+// expected that the `ICorJitHost` value provided to `jitStartup` lives at least as
+// long as the JIT itself.
+class ICorJitHost
+{
+public:
+ // Allocate memory of the given size in bytes. All bytes of the returned block
+ // must be initialized to zero. If `usePageAllocator` is true, the implementation
+ // should use an allocator that deals in OS pages if one exists.
+ virtual void* allocateMemory(size_t size, bool usePageAllocator = false) = 0;
+
+ // Frees memory previous obtained by a call to `ICorJitHost::allocateMemory`. The
+ // value of the `usePageAllocator` parameter must match the value that was
+ // provided to the call to used to allocate the memory.
+ virtual void freeMemory(void* block, bool usePageAllocator = false) = 0;
+
+ // Return an integer config value for the given key, if any exists.
+ virtual int getIntConfigValue(
+ const wchar_t* name,
+ int defaultValue
+ ) = 0;
+
+ // Return a string config value for the given key, if any exists.
+ virtual const wchar_t* getStringConfigValue(
+ const wchar_t* name
+ ) = 0;
+
+ // Free a string ConfigValue returned by the runtime.
+ // JITs using the getStringConfigValue query are required
+ // to return the string values to the runtime for deletion.
+ // This avoids leaking the memory in the JIT.
+ virtual void freeStringConfigValue(
+ const wchar_t* value
+ ) = 0;
+};
+
+#endif
--- /dev/null
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#ifndef __JITHOST_H__
+#define __JITHOST_H__
+
+// Common implementation of ICorJitHost that respects CLR host policies.
+class JitHost : public ICorJitHost
+{
+private:
+ static JitHost theJitHost;
+
+ JitHost() {}
+ JitHost(const JitHost& other) = delete;
+ JitHost& operator=(const JitHost& other) = delete;
+
+public:
+ virtual void* allocateMemory(size_t size, bool usePageAllocator);
+ virtual void freeMemory(void* block, bool usePageAllocator);
+ virtual int getIntConfigValue(const wchar_t* name, int defaultValue);
+ virtual const wchar_t* getStringConfigValue(const wchar_t* name);
+ virtual void freeStringConfigValue(const wchar_t* value);
+
+ static ICorJitHost* getJitHost();
+};
+
+#endif // __JITHOST_H__
getJit
+jitStartup
sxsJitStartup
; See the LICENSE file in the project root for more information.
EXPORTS
getJit
- sxsJitStartup
\ No newline at end of file
+ jitStartup
+ sxsJitStartup
#endif
#include "emit.h"
+
/*****************************************************************************/
+static ICorJitHost* g_jitHost = nullptr;
static CILJit* ILJitter = 0; // The one and only JITTER I return
#ifndef FEATURE_MERGE_JIT_AND_ENGINE
HINSTANCE g_hInst = NULL;
/*****************************************************************************/
-void jitStartup()
+extern "C"
+void __stdcall jitStartup(ICorJitHost* jitHost)
{
+ g_jitHost = jitHost;
+
#ifdef FEATURE_TRACELOGGING
JitTelemetry::NotifyDllProcessAttach();
#endif
#endif
}
+
/*****************************************************************************
* jitOnDllProcessAttach() called by DllMain() when jit.dll is loaded
*/
void jitOnDllProcessAttach()
{
- jitStartup();
+#if COR_JIT_EE_VERSION <= 460
+ jitStartup(JitHost::getJitHost());
+#endif
}
/*****************************************************************************
jitShutdown();
}
-
#ifndef FEATURE_MERGE_JIT_AND_ENGINE
extern "C"
if (ILJitter == 0)
{
ILJitter = new (CILJitSingleton) CILJit();
-#ifdef FEATURE_MERGE_JIT_AND_ENGINE
- jitStartup();
-#endif
}
return(ILJitter);
}
#include <cstdlib>
#include <intrin.h>
+#if COR_JIT_EE_VERSION <= 460
+#include "corjithost.h"
+#include "jithost.h"
+#endif
#include "jit.h"
#include "iallocator.h"
#include "hashbv.h"
; See the LICENSE file in the project root for more information.
EXPORTS
getJit
- sxsJitStartup
\ No newline at end of file
+ jitStartup
+ sxsJitStartup
pedecoder.cpp
winfix.cpp
longfilepathwrappers.cpp
+ jithost.cpp
)
# These source file do not yet compile on Linux.
RelativePath=".\longfilepathwrappers.cpp"
>
</File>
+ <File
+ RelativePath=".\jithost.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>
<ClCompile Include="UTSEM.cpp" />
<ClCompile Include="winfix.cpp" />
<ClCompile Include="longfilepathwrappers.cpp" />
+ <ClCompile Include="jithost.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="hostimpl.h" />
--- /dev/null
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#include "utilcode.h"
+#include "corjit.h"
+#include "jithost.h"
+
+void* JitHost::allocateMemory(size_t size, bool usePageAllocator)
+{
+ WRAPPER_NO_CONTRACT;
+
+ if (usePageAllocator)
+ {
+ return GetEEMemoryManager()->ClrVirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
+ }
+ else
+ {
+ return ClrAllocInProcessHeap(0, S_SIZE_T(size));
+ }
+}
+
+void JitHost::freeMemory(void* block, bool usePageAllocator)
+{
+ WRAPPER_NO_CONTRACT;
+
+ if (usePageAllocator)
+ {
+ GetEEMemoryManager()->ClrVirtualFree(block, 0, MEM_RELEASE);
+ }
+ else
+ {
+ ClrFreeInProcessHeap(0, block);
+ }
+}
+
+int JitHost::getIntConfigValue(const wchar_t* name, int defaultValue)
+{
+ WRAPPER_NO_CONTRACT;
+
+ // Translate JIT call into runtime configuration query
+ CLRConfig::ConfigDWORDInfo info{ name, defaultValue, CLRConfig::REGUTIL_default };
+
+ // Perform a CLRConfig look up on behalf of the JIT.
+ return CLRConfig::GetConfigValue(info);
+}
+
+const wchar_t* JitHost::getStringConfigValue(const wchar_t* name)
+{
+ WRAPPER_NO_CONTRACT;
+
+ // Translate JIT call into runtime configuration query
+ CLRConfig::ConfigStringInfo info{ name, CLRConfig::REGUTIL_default };
+
+ // Perform a CLRConfig look up on behalf of the JIT.
+ return CLRConfig::GetConfigValue(info);
+}
+
+void JitHost::freeStringConfigValue(const wchar_t* value)
+{
+ WRAPPER_NO_CONTRACT;
+
+ CLRConfig::FreeConfigString(const_cast<wchar_t*>(value));
+}
+
+JitHost JitHost::theJitHost;
+ICorJitHost* JitHost::getJitHost()
+{
+ STATIC_CONTRACT_SO_TOLERANT;
+ STATIC_CONTRACT_GC_NOTRIGGER;
+ STATIC_CONTRACT_NOTHROW;
+ STATIC_CONTRACT_CANNOT_TAKE_LOCK;
+
+ return &theJitHost;
+}
<CppCompile Include="$(UtilCodeSrcDir)\SecurityUtil.cpp" />
<CppCompile Include="$(UtilCodeSrcDir)\AppXUtil.cpp" Condition="'$(FeatureAppX)' == 'true'"/>
+
+ <CppCompile Include="$(UtilCodeSrcDir)\jithost.cpp" />
</ItemGroup>
</Project>
#include "common.h"
#include "jitinterface.h"
#include "corjit.h"
+#include "jithost.h"
#include "eetwain.h"
#include "eeconfig.h"
#include "excep.h"
JIT_LOAD_STATUS_DONE_LOAD, // LoadLibrary of the JIT dll succeeded.
JIT_LOAD_STATUS_DONE_GET_SXSJITSTARTUP, // GetProcAddress for "sxsJitStartup" succeeded.
JIT_LOAD_STATUS_DONE_CALL_SXSJITSTARTUP, // Calling sxsJitStartup() succeeded.
+ JIT_LOAD_STATUS_DONE_GET_JITSTARTUP, // GetProcAddress for "jitStartup" succeeded.
+ JIT_LOAD_STATUS_DONE_CALL_JITSTARTUP, // Calling jitStartup() succeeded.
JIT_LOAD_STATUS_DONE_GET_GETJIT, // GetProcAddress for "getJit" succeeded.
JIT_LOAD_STATUS_DONE_CALL_GETJIT, // Calling getJit() succeeded.
JIT_LOAD_STATUS_DONE_CALL_GETVERSIONIDENTIFIER, // Calling ICorJitCompiler::getVersionIdentifier() succeeded.
pJitLoadData->jld_status = JIT_LOAD_STATUS_DONE_CALL_SXSJITSTARTUP;
+ typedef void (__stdcall* pjitStartup)(ICorJitHost*);
+ pjitStartup jitStartupFn = (pjitStartup) GetProcAddress(*phJit, "jitStartup");
+
+ if (jitStartupFn)
+ {
+ pJitLoadData->jld_status = JIT_LOAD_STATUS_DONE_GET_JITSTARTUP;
+
+ (*jitStartupFn)(JitHost::getJitHost());
+
+ pJitLoadData->jld_status = JIT_LOAD_STATUS_DONE_CALL_JITSTARTUP;
+ }
+
typedef ICorJitCompiler* (__stdcall* pGetJitFn)();
pGetJitFn getJitFn = (pGetJitFn) GetProcAddress(*phJit, "getJit");
}
#ifdef FEATURE_MERGE_JIT_AND_ENGINE
+EXTERN_C void __stdcall jitStartup(ICorJitHost* host);
EXTERN_C ICorJitCompiler* __stdcall getJit();
#endif // FEATURE_MERGE_JIT_AND_ENGINE
#ifdef FEATURE_MERGE_JIT_AND_ENGINE
- typedef ICorJitCompiler* (__stdcall* pGetJitFn)();
- pGetJitFn getJitFn = (pGetJitFn) getJit;
EX_TRY
{
- newJitCompiler = (*getJitFn)();
+ jitStartup(JitHost::getJitHost());
+
+ newJitCompiler = getJit();
// We don't need to call getVersionIdentifier(), since the JIT is linked together with the VM.
}
/*****************************************************************************/
-class EEJitManager :public IJitManager
+class EEJitManager : public IJitManager
{
#ifdef DACCESS_COMPILE
friend class ClrDataAccess;
UNREACHABLE(); // only called on derived class.
}
-// Allow access to CLRConfig environment variables from the JIT with
-// out exposing CLR internals.
-//
-// Args:
-// name - String name being queried for.
-// defaultValue - Default integer value to return if no value is found.
-//
-// Returns:
-// Raw string from environment variable. Caller owns the string.
-//
-int CEEInfo::getIntConfigValue(
- const wchar_t *name, int defaultValue
- )
-{
- CONTRACTL{
- SO_TOLERANT;
- THROWS;
- GC_TRIGGERS;
- MODE_PREEMPTIVE;
- } CONTRACTL_END;
-
- DWORD ret = defaultValue;
-
- JIT_TO_EE_TRANSITION();
-
- // Translate JIT call into runtime configuration query
- CLRConfig::ConfigDWORDInfo info{ name, defaultValue, CLRConfig::REGUTIL_default };
-
- // Perform a CLRConfig look up on behalf of the JIT.
- ret = CLRConfig::GetConfigValue(info);
-
- EE_TO_JIT_TRANSITION();
-
- return ret;
-}
-
-// Allow access to CLRConfig environment variables from the JIT with
-// out exposing CLR internals.
-//
-// Args:
-// name - String name being queried for.
-//
-// Returns:
-// Raw string from environment variable. Caller owns the string.
-//
-wchar_t *CEEInfo::getStringConfigValue(
- const wchar_t *name
- )
-{
- CONTRACTL{
- SO_TOLERANT;
- THROWS;
- GC_TRIGGERS;
- MODE_PREEMPTIVE;
- } CONTRACTL_END;
-
- wchar_t * returnStr = nullptr;
-
- JIT_TO_EE_TRANSITION();
-
- // Translate JIT call into runtime configuration query
- CLRConfig::ConfigStringInfo info{ name, CLRConfig::REGUTIL_default };
-
- // Perform a CLRConfig look up on behalf of the JIT.
- returnStr = CLRConfig::GetConfigValue(info);
-
- EE_TO_JIT_TRANSITION();
-
- return returnStr;
-}
-
-// Free runtime allocated CLRConfig strings requrested by the JIT.
-//
-// Args:
-// value - String to be freed.
-//
-void CEEInfo::freeStringConfigValue(
- wchar_t *value
- )
-{
- CONTRACTL{
- SO_TOLERANT;
- THROWS;
- GC_TRIGGERS;
- MODE_PREEMPTIVE;
- } CONTRACTL_END;
-
- JIT_TO_EE_TRANSITION();
-
- CLRConfig::FreeConfigString(value);
-
- EE_TO_JIT_TRANSITION();
-}
-
#endif // !DACCESS_COMPILE
EECodeInfo::EECodeInfo()
DWORD getExpectedTargetArchitecture();
- int getIntConfigValue(
- const wchar_t *name,
- int defaultValue
- );
-
- wchar_t *getStringConfigValue(
- const wchar_t *name
- );
-
- void freeStringConfigValue(
- __in_z wchar_t *value
- );
-
CEEInfo(MethodDesc * fd = NULL, bool fVerifyOnly = false) :
m_pOverride(NULL),
m_pMethodBeingCompiled(fd),
#include "utilcode.h"
#include "corjit.h"
+#include "jithost.h"
#include "corcompile.h"
#include "iceefilegen.h"
#ifdef FEATURE_FUSION
ICorJitInfo::ProfileBuffer * profileBuffer;
return SUCCEEDED(getBBProfileData(m_currentMethodHandle, &size, &profileBuffer, NULL));
}
-
-int ZapInfo::getIntConfigValue(const wchar_t *name, int defaultValue)
-{
- int ret;
-
- // Translate JIT call into runtime configuration query
- CLRConfig::ConfigDWORDInfo info{name, defaultValue, CLRConfig::REGUTIL_default};
-
- // Perform a CLRConfig look up on behalf of the JIT.
- ret = CLRConfig::GetConfigValue(info);
-
- return ret;
-}
-
-wchar_t *ZapInfo::getStringConfigValue(const wchar_t *name)
-{
- wchar_t *returnStr = nullptr;
-
- // Translate JIT call into runtime configuration query
- CLRConfig::ConfigStringInfo info { name, CLRConfig::REGUTIL_default };
-
- // Perform a CLRConfig look up on behalf of the JIT.
- returnStr = CLRConfig::GetConfigValue(info);
-
- return returnStr;
-}
-
-void ZapInfo::freeStringConfigValue(wchar_t *value)
-{
- CLRConfig::FreeConfigString(value);
-}
void HandleException(struct _EXCEPTION_POINTERS *pExceptionPointers);
void ThrowExceptionForJitResult(HRESULT result);
void ThrowExceptionForHelper(const CORINFO_HELPER_DESC * throwHelper);
-
- int getIntConfigValue(const wchar_t *name, int defaultValue);
-
- wchar_t *getStringConfigValue(const wchar_t *name);
-
- void freeStringConfigValue(__in_z wchar_t *value);
};
#endif // __ZAPINFO_H__
(*sxsJitStartupFn) (cccallbacks);
#endif
+ typedef void (__stdcall* pJitStartup)(ICorJitHost* host);
+ pJitStartup jitStartupFn = (pJitStartup)GetProcAddress(*phJit, "jitStartup");
+ if (jitStartupFn != nullptr)
+ {
+ jitStartupFn(JitHost::getJitHost());
+ }
+
//get the appropriate compiler interface
typedef ICorJitCompiler* (__stdcall* pGetJitFn)();
pGetJitFn getJitFn = (pGetJitFn) GetProcAddress(*phJit, "getJit");
//
#ifdef FEATURE_MERGE_JIT_AND_ENGINE
+ jitStartup(JitHost::getJitHost());
m_pJitCompiler = getJit();
if (m_pJitCompiler == NULL)
projects / platform / upstream / dotnet / runtime.git / commitdiff