Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/Native/Bootstrap/main.cpp')
-rw-r--r--src/Native/Bootstrap/main.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Native/Bootstrap/main.cpp b/src/Native/Bootstrap/main.cpp
index 43860640d..f327d28c6 100644
--- a/src/Native/Bootstrap/main.cpp
+++ b/src/Native/Bootstrap/main.cpp
@@ -245,9 +245,12 @@ extern "C" void RhpUniversalTransition_DebugStepTailCall()
{
throw "RhpUniversalTransition_DebugStepTailCall";
}
+extern "C" void ConstrainedCallSupport_GetStubs()
+{
+ throw "ConstrainedCallSupport_GetStubs";
+}
-void* RtRHeaderWrapper();
-
+extern "C" void* RtRHeaderWrapper();
#endif // CPPCODEGEN
// This works around System.Private.Interop's references to Interop.Native.
@@ -279,6 +282,8 @@ extern "C" bool RhRegisterOSModule(void * pModule,
extern "C" void* PalGetModuleHandleFromPointer(void* pointer);
+#endif // !CPPCODEGEN
+
extern "C" void GetRuntimeException();
extern "C" void FailFast();
extern "C" void AppendExceptionStackFrame();
@@ -299,8 +304,6 @@ static const pfn c_classlibFunctions[] = {
nullptr, // &DebugFuncEvalAbortHelper,
};
-#endif // !CPPCODEGEN
-
extern "C" void InitializeModules(void* osModule, void ** modules, int count, void ** pClasslibFunctions, int nClasslibFunctions);
#ifndef CORERT_DLL
@@ -341,10 +344,9 @@ static int InitializeRuntime()
#ifndef CPPCODEGEN
InitializeModules(osModule, __modules_a, (int)((__modules_z - __modules_a)), (void **)&c_classlibFunctions, _countof(c_classlibFunctions));
#elif defined _WASM_
- // WASMTODO: Figure out what to do here. This is a NativeCallable method in the runtime
- // and we also would have to figure out what to pass for pModuleHeaders
+ InitializeModules(nullptr, (void**)RtRHeaderWrapper(), 1, nullptr, 0);
#else // !CPPCODEGEN
- InitializeModules(nullptr, (void**)RtRHeaderWrapper(), 2, nullptr, 0);
+ InitializeModules(nullptr, (void**)RtRHeaderWrapper(), 2, (void **)&c_classlibFunctions, _countof(c_classlibFunctions));
#endif // !CPPCODEGEN
#ifdef CORERT_DLL