current

src/coreclr/src/dlls/mscoree/unixinterface.cpp

@@ -18,6 +18,10 @@
 #include "../../vm/gdbjithelpers.h"
 #endif // FEATURE_GDBJIT
 #include "bundle.h"
+#include "pinvokeoverride.h"
+
+// TODO: WIP, this is for testing, will remove later.
+#include "pinvokeoverrideimpl.h"
 
 #define ASSERTE_ALL_BUILDS(expr) _ASSERTE_ALL_BUILDS(__FILE__, (expr))
 
@@ -211,6 +215,14 @@ int coreclr_initialize(
 
     g_hostpolicy_embedded = hostPolicyEmbedded;
 
+    // TODO: WIP, fetch this from args similar to Bundle/bundleProbe
+    //
+    // if (overider != nullptr)
+    // {
+    //     PInvokeOverride::SetPInvokeOverride(overrider);
+    // }
+    PInvokeOverride::SetPInvokeOverride(SuperHost::ResolveDllImport);
+
     ReleaseHolder<ICLRRuntimeHost4> host;
 
     hr = CorHost2::CreateObject(IID_ICLRRuntimeHost4, (void**)&host);

src/coreclr/src/inc/pinvokeoverride.h

@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+/*****************************************************************************
+ **                                                                         **
+ ** pinvokeoverride.h - PInvoke binding override                            **
+ **                                                                         **
+ *****************************************************************************/
+
+#ifndef _PINVOKEOVERRIDE_H_
+#define _PINVOKEOVERRIDE_H_
+
+typedef const void* (__stdcall PInvokeOverrideFn)(const char* libraryName, const char* entrypointName);
+
+class PInvokeOverride
+{
+private:
+    static PInvokeOverrideFn* s_overrideImpl;
+
+public:
+    static void SetPInvokeOverride(PInvokeOverrideFn* overrideImpl);
+    static const void* TryGetMethodImpl(const char* libraryName, const char* entrypointName);
+};
+
+#endif // _PINVOKEOVERRIDE_H_
+// EOF =======================================================================

src/coreclr/src/inc/pinvokeoverrideimpl.h

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+//
+// REVIEW: THE IMPLEMENTATION FOR THE OVERRIDER WILL BE MOVED TO HOST
+//
+
+namespace SuperHost
+{
+    const void* ResolveDllImport(const char* libraryName, const char* entrypointName);
+}

src/coreclr/src/vm/CMakeLists.txt

@@ -102,6 +102,8 @@ set(VM_SOURCES_DAC_AND_WKS_COMMON
     perfmap.cpp
     perfinfo.cpp
     pgo.cpp
+    pinvokeoverride.cpp
+    pinvokeoverrideimpl.cpp
     precode.cpp
     prestub.cpp
     profilerdiagnosticprotocolhelper.cpp

src/coreclr/src/vm/corelib.cpp

@@ -371,11 +371,6 @@ const USHORT c_nCoreLibFieldDescriptions = NumItems(c_rgCoreLibFieldDescriptions
 // ECalls
 //
 
-// ECalls defined by libraries-native shims
-EXTERN_C const LPVOID gPalGlobalizationNative[];
-EXTERN_C const LPVOID gEmbedded_Brotli[];
-EXTERN_C const LPVOID gEmbedded_zlib[];
-
 // When compiling crossgen, we only need the target version of the ecall tables
 #if !defined(CROSSGEN_COMPILE) || defined(CROSSGEN_CORELIB)
 

src/coreclr/src/vm/dllimport.cpp

@@ -34,6 +34,7 @@
 #include "strongnameholders.h"
 #include "ecall.h"
 #include "fieldmarshaler.h"
+#include "pinvokeoverride.h"
 
 #include <formattype.h>
 #include "../md/compiler/custattr.h"
@@ -4230,11 +4231,7 @@ void NDirect::PopulateNDirectMethodDesc(NDirectMethodDesc* pNMD, PInvokeStaticSi
     if (callConv == pmCallConvThiscall)
         ndirectflags |= NDirectMethodDesc::kThisCall;
 
-    if ((pNMD->GetLoaderModule()->IsSystem() && (strcmp(szLibName, "QCall") == 0)) ||
-        (szLibName != NULL &&
-        (strcmp(szLibName, "libSystem.Globalization.Native") == 0 || 
-         strcmp(szLibName, "libSystem.IO.Compression.Native") == 0 ||
-         strcmp(szLibName, "clrcompression") == 0)))
+    if (pNMD->GetLoaderModule()->IsSystem() && (strcmp(szLibName, "QCall") == 0))
     {
         ndirectflags |= NDirectMethodDesc::kIsQCall;
     }
@@ -6512,6 +6509,15 @@ VOID NDirect::NDirectLink(NDirectMethodDesc *pMD)
     // Loading unmanaged dlls can trigger dllmains which certainly count as code execution!
     pMD->EnsureActive();
 
+    {
+        LPVOID pvTarget = (LPVOID)PInvokeOverride::TryGetMethodImpl(pMD->GetLibNameRaw(), pMD->GetEntrypointName());
+        if (pvTarget != NULL)
+        {
+            pMD->SetNDirectTarget(pvTarget);
+            return;
+        }
+    }
+
     LoadLibErrorTracker errorTracker;
 
     BOOL fSuccess = FALSE;

src/coreclr/src/vm/ecalllist.h

@@ -1116,9 +1116,6 @@ FCClassElement("AssemblyExtensions", "System.Reflection.Metadata", gAssemblyExte
 FCClassElement("AssemblyLoadContext", "System.Runtime.Loader", gAssemblyLoadContextFuncs)
 
 FCClassElement("AssemblyName", "System.Reflection", gAssemblyNameFuncs)
-#ifndef CROSSGEN_COMPILE
-FCClassElement("Brotli", "", gEmbedded_Brotli)
-#endif
 FCClassElement("Buffer", "System", gBufferFuncs)
 FCClassElement("CLRConfig", "System", gClrConfig)
 FCClassElement("CastHelpers", "System.Runtime.CompilerServices", gCastHelpers)
@@ -1142,9 +1139,6 @@ FCClassElement("FileLoadException", "System.IO", gFileLoadExceptionFuncs)
 FCClassElement("GC", "System", gGCInterfaceFuncs)
 FCClassElement("GCHandle", "System.Runtime.InteropServices", gGCHandleFuncs)
 FCClassElement("GCSettings", "System.Runtime", gGCSettingsFuncs)
-#ifndef CROSSGEN_COMPILE
-FCClassElement("Globalization", "", gPalGlobalizationNative)
-#endif
 #ifdef FEATURE_COMINTEROP
 FCClassElement("IEnumerable", "System.Collections", gStdMngIEnumerableFuncs)
 FCClassElement("IEnumerator", "System.Collections", gStdMngIEnumeratorFuncs)
@@ -1227,10 +1221,6 @@ FCClassElement("X86Base", "System.Runtime.Intrinsics.X86", gX86BaseFuncs)
 FCClassElement("XplatEventLogger", "System.Diagnostics.Tracing", gEventLogger)
 #endif //defined(FEATURE_EVENTSOURCE_XPLAT)
 
-#ifndef CROSSGEN_COMPILE
-FCClassElement("zlib", "", gEmbedded_zlib)
-#endif
-
 #undef FCFuncElement
 #undef FCFuncElementSig
 #undef FCIntrinsic

src/coreclr/src/vm/pinvokeoverride.cpp

@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//*****************************************************************************
+// pinvokeoverride.cpp
+//
+// Helpers to implement PInvoke overriding
+//
+//*****************************************************************************
+
+#include "pinvokeoverride.h"
+
+PInvokeOverrideFn* PInvokeOverride::s_overrideImpl = nullptr;
+
+void PInvokeOverride::SetPInvokeOverride(PInvokeOverrideFn* overrideImpl)
+{
+    s_overrideImpl = overrideImpl;
+}
+
+const void* PInvokeOverride::TryGetMethodImpl(const char* libraryName, const char* entrypointName)
+{
+    return s_overrideImpl ?
+        s_overrideImpl(libraryName, entrypointName) :
+        nullptr;
+}

src/coreclr/src/vm/pinvokeoverrideimpl.cpp

@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+//
+// REVIEW: THE IMPLEMENTATION FOR THE OVERRIDER WILL BE MOVED TO HOST
+//
+
+#include "common.h"
+#include "pinvokeoverrideimpl.h"
+
+extern "C" const void* GlobalizationResolveDllImport(const char* name);
+extern "C" const void* CompressionResolveDllImport(const char* name);
+
+const void* SuperHost::ResolveDllImport(const char* libraryName, const char* entrypointName)
+{
+    if (strcmp(libraryName, "libSystem.Globalization.Native") == 0)
+    {
+        return GlobalizationResolveDllImport(entrypointName);
+    }
+
+#if defined(_WIN32)
+    if (strcmp(libraryName, "clrcompression") == 0)
+#else
+    if (strcmp(libraryName, "libSystem.IO.Compression.Native") == 0)
+#endif
+    {
+        return CompressionResolveDllImport(entrypointName);
+    }
+
+    return nullptr;
+}

src/libraries/Native/AnyOS/System.IO.Compression.Native/entrypoints.c

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#include <string.h>
 #include <stdint.h>
 
 // Include System.IO.Compression.Native headers
@@ -10,33 +11,47 @@
 #include "../brotli/include/brotli/port.h"
 #include "../brotli/include/brotli/types.h"
 
-#define FCFuncStart(name) EXTERN_C const void* name[]; const void* name[] = {
-#define FCFuncEnd() (void*)0x01 /* FCFuncFlag_EndOfArray */ };
+#ifndef lengthof
+#define lengthof(rg)    (sizeof(rg)/sizeof(rg[0]))
+#endif
 
-#define QCFuncElement(name,impl) \
-    (void*)0x8 /* FCFuncFlag_QCall */, (void*)(impl), (void*)name,
+typedef struct
+{
+    const char* name;
+    const void* method;
+} Entry;
 
-FCFuncStart(gEmbedded_Brotli)
-    QCFuncElement("BrotliDecoderCreateInstance", BrotliDecoderCreateInstance)
-    QCFuncElement("BrotliDecoderDecompress", BrotliDecoderDecompress)
-    QCFuncElement("BrotliDecoderDecompressStream", BrotliDecoderDecompressStream)
-    QCFuncElement("BrotliDecoderDestroyInstance", BrotliDecoderDestroyInstance)
-    QCFuncElement("BrotliDecoderIsFinished", BrotliDecoderIsFinished)
-    QCFuncElement("BrotliEncoderCompress", BrotliEncoderCompress)
-    QCFuncElement("BrotliEncoderCompressStream", BrotliEncoderCompressStream)
-    QCFuncElement("BrotliEncoderCreateInstance", BrotliEncoderCreateInstance)
-    QCFuncElement("BrotliEncoderDestroyInstance", BrotliEncoderDestroyInstance)
-    QCFuncElement("BrotliEncoderHasMoreOutput", BrotliEncoderHasMoreOutput)
-    QCFuncElement("BrotliEncoderSetParameter", BrotliEncoderSetParameter)
-FCFuncEnd()
+static Entry s_compressionNative[] =
+{
+    {"BrotliDecoderCreateInstance", BrotliDecoderCreateInstance},
+    {"BrotliDecoderDecompress", BrotliDecoderDecompress},
+    {"BrotliDecoderDecompressStream", BrotliDecoderDecompressStream},
+    {"BrotliDecoderDestroyInstance", BrotliDecoderDestroyInstance},
+    {"BrotliDecoderIsFinished", BrotliDecoderIsFinished},
+    {"BrotliEncoderCompress", BrotliEncoderCompress},
+    {"BrotliEncoderCompressStream", BrotliEncoderCompressStream},
+    {"BrotliEncoderCreateInstance", BrotliEncoderCreateInstance},
+    {"BrotliEncoderDestroyInstance", BrotliEncoderDestroyInstance},
+    {"BrotliEncoderHasMoreOutput", BrotliEncoderHasMoreOutput},
+    {"BrotliEncoderSetParameter", BrotliEncoderSetParameter},
+    {"CompressionNative_Crc32", CompressionNative_Crc32},
+    {"CompressionNative_Deflate", CompressionNative_Deflate},
+    {"CompressionNative_DeflateEnd", CompressionNative_DeflateEnd},
+    {"CompressionNative_DeflateInit2_", CompressionNative_DeflateInit2_},
+    {"CompressionNative_Inflate", CompressionNative_Inflate},
+    {"CompressionNative_InflateEnd", CompressionNative_InflateEnd},
+    {"CompressionNative_InflateInit2_", CompressionNative_InflateInit2_},
+};
 
-FCFuncStart(gEmbedded_zlib)
-    QCFuncElement("crc32", CompressionNative_Crc32)
-    QCFuncElement("Deflate", CompressionNative_Deflate)
-    QCFuncElement("DeflateEnd", CompressionNative_DeflateEnd)
-    QCFuncElement("DeflateInit2_", CompressionNative_DeflateInit2_)
-    QCFuncElement("Inflate", CompressionNative_Inflate)
-    QCFuncElement("InflateEnd", CompressionNative_InflateEnd)
-    QCFuncElement("InflateInit2_", CompressionNative_InflateInit2_)
-FCFuncEnd()
+extern const void* CompressionResolveDllImport(const char* name)
+{
+    for (int i = 0; i < lengthof(s_compressionNative); i++)
+    {
+        if (strcmp(name, s_compressionNative[i].name) == 0)
+        {
+            return s_compressionNative[i].method;
+        }
+    }
 
+    return NULL;
+}

src/libraries/Native/Unix/System.Globalization.Native/entrypoints.c

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #include <stdint.h>
+#include <string.h>
 
 typedef uint16_t UChar;
 
@@ -60,3 +61,64 @@ FCFuncStart(gPalGlobalizationNative)
     QCFuncElement("ToAscii", GlobalizationNative_ToAscii)
     QCFuncElement("ToUnicode", GlobalizationNative_ToUnicode)
 FCFuncEnd()
+
+#ifndef lengthof
+#define lengthof(rg)    (sizeof(rg)/sizeof(rg[0]))
+#endif
+
+typedef struct
+{
+    const char* name;
+    const void* method;
+} Entry;
+
+static Entry s_globalizationNative[] =
+{
+    {"GlobalizationNative_ChangeCase", GlobalizationNative_ChangeCase},
+    {"GlobalizationNative_ChangeCaseInvariant", GlobalizationNative_ChangeCaseInvariant},
+    {"GlobalizationNative_ChangeCaseTurkish", GlobalizationNative_ChangeCaseTurkish},
+    {"GlobalizationNative_CloseSortHandle", GlobalizationNative_CloseSortHandle},
+    {"GlobalizationNative_CompareString", GlobalizationNative_CompareString},
+    {"GlobalizationNative_EndsWith", GlobalizationNative_EndsWith},
+    {"GlobalizationNative_EnumCalendarInfo", GlobalizationNative_EnumCalendarInfo},
+    {"GlobalizationNative_GetCalendarInfo", GlobalizationNative_GetCalendarInfo},
+    {"GlobalizationNative_GetCalendars", GlobalizationNative_GetCalendars},
+    {"GlobalizationNative_GetDefaultLocaleName", GlobalizationNative_GetDefaultLocaleName},
+    {"GlobalizationNative_GetICUVersion", GlobalizationNative_GetICUVersion},
+    {"GlobalizationNative_GetJapaneseEraStartDate", GlobalizationNative_GetJapaneseEraStartDate},
+    {"GlobalizationNative_GetLatestJapaneseEra", GlobalizationNative_GetLatestJapaneseEra},
+    {"GlobalizationNative_GetLocaleInfoGroupingSizes", GlobalizationNative_GetLocaleInfoGroupingSizes},
+    {"GlobalizationNative_GetLocaleInfoInt", GlobalizationNative_GetLocaleInfoInt},
+    {"GlobalizationNative_GetLocaleInfoString", GlobalizationNative_GetLocaleInfoString},
+    {"GlobalizationNative_GetLocaleName", GlobalizationNative_GetLocaleName},
+    {"GlobalizationNative_GetLocales", GlobalizationNative_GetLocales},
+    {"GlobalizationNative_GetLocaleTimeFormat", GlobalizationNative_GetLocaleTimeFormat},
+    {"GlobalizationNative_GetSortHandle", GlobalizationNative_GetSortHandle},
+    {"GlobalizationNative_GetSortKey", GlobalizationNative_GetSortKey},
+    {"GlobalizationNative_GetSortVersion", GlobalizationNative_GetSortVersion},
+    {"GlobalizationNative_GetTimeZoneDisplayName", GlobalizationNative_GetTimeZoneDisplayName},
+    {"GlobalizationNative_IndexOf", GlobalizationNative_IndexOf},
+    {"GlobalizationNative_InitICUFunctions", GlobalizationNative_InitICUFunctions},
+    {"GlobalizationNative_InitOrdinalCasingPage", GlobalizationNative_InitOrdinalCasingPage},
+    {"GlobalizationNative_IsNormalized", GlobalizationNative_IsNormalized},
+    {"GlobalizationNative_IsPredefinedLocale", GlobalizationNative_IsPredefinedLocale},
+    {"GlobalizationNative_LastIndexOf", GlobalizationNative_LastIndexOf},
+    {"GlobalizationNative_LoadICU", GlobalizationNative_LoadICU},
+    {"GlobalizationNative_NormalizeString", GlobalizationNative_NormalizeString},
+    {"GlobalizationNative_StartsWith", GlobalizationNative_StartsWith},
+    {"GlobalizationNative_ToAscii", GlobalizationNative_ToAscii},
+    {"GlobalizationNative_ToUnicode", GlobalizationNative_ToUnicode},
+};
+
+extern "C" const void* GlobalizationResolveDllImport(const char* name)
+{
+    for (int i = 0; i < lengthof(s_globalizationNative); i++)
+    {
+        if (strcmp(name, s_globalizationNative[i].name) == 0)
+        {
+            return s_globalizationNative[i].method;
+        }
+    }
+
+    return NULL;
+}