Make HelloWorld run on wasm with core[wasm]run (#119640)

Author: radekdoulik

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -44,17 +44,18 @@ else(CLR_CMAKE_HOST_WIN32)
     endif()
     # Static linking
     if (CLR_CMAKE_TARGET_ARCH_WASM)
+        target_sources(corerun PRIVATE corerun.wasm.cpp)
         target_link_libraries(corerun PRIVATE
         coreclr_static
-        clrinterpreter)
+        System.Native-Static
+        System.Native.TimeZoneData)
         # linker options for NodeJs, link in JavaScript helper, access to local filesystem
         if (CLR_CMAKE_TARGET_BROWSER)
             target_compile_options(corerun PRIVATE -fwasm-exceptions)
             target_link_options(corerun PRIVATE
                 -fwasm-exceptions
                 -sEXPORTED_RUNTIME_METHODS=FS
                 -sEXIT_RUNTIME=1
-                -sWASM_BIGINT=1
                 -sINITIAL_MEMORY=134217728
                 -sSTACK_SIZE=5MB
                 -lnoderawfs.js

src/coreclr/hosts/corerun/corerun.cpp

@@ -9,6 +9,10 @@
 #include "corerun.hpp"
 #include "dotenv.hpp"
 
+#ifdef TARGET_WASM
+#include "corerun.wasm.hpp"
+#endif
+
 #include <fstream>
 
 using char_t = pal::char_t;
@@ -486,6 +490,11 @@ static int run(const configuration& config)
         coreclr_set_error_writer_func(log_error_info);
     }
 
+#ifdef TARGET_WASM
+    // install the pinvoke override callback to resolve p/invokes to statically linked libraries
+    wasm_add_pinvoke_override();
+#endif
+
     int result;
     result = coreclr_init_func(
         exe_path_utf8.c_str(),

src/coreclr/hosts/corerun/corerun.wasm.cpp

@@ -0,0 +1,29 @@
+// 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>
+
+#define _In_z_
+#define _In_
+#include "pinvokeoverride.h"
+
+extern "C" const void* SystemResolveDllImport(const char* name);
+
+// pinvoke_override:
+// Check if given function belongs to one of statically linked libraries and return a pointer if found.
+const void* pinvoke_override(const char* library_name, const char* entry_point_name)
+{
+    // This function is only called with the library name specified for a p/invoke, not any variations.
+    // It must handle exact matches to the names specified. See Interop.Libraries.cs for each platform.
+    if (strcmp(library_name, "libSystem.Native") == 0)
+    {
+        return SystemResolveDllImport(entry_point_name);
+    }
+
+    return nullptr;
+}
+
+void wasm_add_pinvoke_override()
+{
+    PInvokeOverride::SetPInvokeOverride(pinvoke_override, PInvokeOverride::Source::RuntimeConfiguration);
+}

src/coreclr/hosts/corerun/corerun.wasm.hpp

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#ifndef __CORERUN_WASM_HPP__
+#define __CORERUN_WASM_HPP__
+
+void wasm_add_pinvoke_override();
+
+#endif // __CORERUN_WASM_HPP__

src/coreclr/hosts/corewasmrun/CMakeLists.txt

@@ -4,25 +4,31 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_executable_clr(corewasmrun
   corewasmrun.cpp
+  ../corerun/corerun.wasm.cpp
 )
 
 set(_WASM_PRELOAD_DIR "${CMAKE_INSTALL_PREFIX}/IL")
 if (EXISTS "${_WASM_PRELOAD_DIR}")
   set(_WASM_PRELOAD_FILE --preload-file ${_WASM_PRELOAD_DIR}@/)
 endif (EXISTS "${_WASM_PRELOAD_DIR}")
 
+target_include_directories(corewasmrun PRIVATE
+  ../corerun
+)
+
 target_compile_options(corewasmrun PRIVATE -fwasm-exceptions)
 target_link_options(corewasmrun PRIVATE
   -fwasm-exceptions
   -sEXIT_RUNTIME=1
-  -sWASM_BIGINT=1
   -sINITIAL_MEMORY=134217728
+  -sSTACK_SIZE=5MB
   -sFORCE_FILESYSTEM=1
   ${_WASM_PRELOAD_FILE}
   -Wl,-error-limit=0)
-
 target_link_libraries(corewasmrun PRIVATE
-  coreclr_static)
+  coreclr_static
+  System.Native-Static
+  System.Native.TimeZoneData)
 
 # The corerun version for wasm is being installed in its own directory
 # because it is an executable that comes with an index.html and we

src/coreclr/hosts/corewasmrun/corewasmrun.cpp

@@ -4,6 +4,9 @@
 
 #include <cstdio>
 #include <coreclrhost.h>
+#include <vector>
+
+#include "corerun.wasm.hpp"
 
 static void log_error_info(const char* line)
 {
@@ -16,14 +19,26 @@ static unsigned int CurrentAppDomainId;
 
 static int run()
 {
-    const char* exe_path = "<coreclr-wasm>";
+    const char* exe_path = "/";
     const char* app_domain_name = "corewasmrun";
     const char* entry_assembly = "ManagedAssembly.dll";
 
+    // Set base initialization properties.
+    std::vector<const char*> propertyKeys;
+    std::vector<const char*> propertyValues;
+
+    propertyKeys.push_back("TRUSTED_PLATFORM_ASSEMBLIES");
+    propertyValues.push_back("/HelloWorld.dll:/System.Private.CoreLib.dll:/System.Runtime.dll:/System.Console.dll:/System.Threading.dll:/System.Runtime.InteropServices.dll");
+    propertyKeys.push_back("NATIVE_DLL_SEARCH_DIRECTORIES");
+    propertyValues.push_back("/:.:");
+
     coreclr_set_error_writer(log_error_info);
 
-    printf("call coreclr_initialize\n");
-    int retval = coreclr_initialize(exe_path, app_domain_name, 0, nullptr, nullptr, &CurrentClrInstance, &CurrentAppDomainId);
+    wasm_add_pinvoke_override();
+
+    printf("BEGIN: call coreclr_initialize\n");
+    int retval = coreclr_initialize(exe_path, app_domain_name, 1, propertyKeys.data(), propertyValues.data(), &CurrentClrInstance, &CurrentAppDomainId);
+    printf("END: call coreclr_initialize\n");
 
     if (retval < 0)
     {
@@ -35,8 +50,26 @@ static int run()
         printf("coreclr_initialize succeeded - retval: 0x%08x\n", retval);
     }
 
-    // coreclr_execute_assembly();
-    // coreclr_shutdown();
+    int exit_code;
+    printf("BEGIN: call coreclr_execute_assembly\n");
+    retval = coreclr_execute_assembly(CurrentClrInstance, CurrentAppDomainId, 0, nullptr, "HelloWorld.dll", (uint32_t*)&exit_code);
+    printf("END: call coreclr_execute_assembly\n");
+
+    if (retval < 0)
+    {
+        std::fprintf(stderr, "coreclr_execute_assembly failed - Error: 0x%08x\n", retval);
+        return -1;
+    }
+
+    int latched_exit_code = 0;
+    printf("BEGIN: call coreclr_shutdown_2\n");
+    retval = coreclr_shutdown_2(CurrentClrInstance, CurrentAppDomainId, &latched_exit_code);
+    printf("END: call coreclr_shutdown_2\n");
+    if (retval < 0)
+    {
+        std::fprintf(stderr, "coreclr_shutdown_2 failed - Error: 0x%08x\n", retval);
+        exit_code = -1;
+    }
 
     return retval;
 }

src/coreclr/runtime.proj

@@ -6,12 +6,14 @@
     <HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true' or '$(ClrCrossComponentsSubset)' == 'true'">true</HasCdacBuildTool>
 
     <_IcuDir Condition="'$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != '' and '$(TargetsBrowser)' == 'true'">$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir>
+    <_TzdDir Condition="'$(PkgSystem_Runtime_TimeZoneData)' != ''">$([MSBuild]::NormalizePath('$(PkgSystem_Runtime_TimeZoneData)', 'contentFiles', 'any', 'any', 'data'))</_TzdDir>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="runtime-prereqs.proj" GlobalPropertiesToRemove="$(NativeBuildPartitionPropertiesToRemove)" />
     <ProjectReference Condition="'$(HasCdacBuildTool)' == 'true'" Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" GlobalPropertiesToRemove="$(NativeBuildPartitionPropertiesToRemove)" />
     <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
+    <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="System.Runtime.TimeZoneData" PrivateAssets="all" Version="$(SystemRuntimeTimeZoneDataVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
@@ -53,6 +55,7 @@
       <_CoreClrBuildArg Include="-cmakeargs &quot;-DCLR_DOTNET_HOST_PATH=$(DOTNET_HOST_PATH)&quot;" />
       <_CoreClrBuildArg Condition="'$(HasCdacBuildTool)' == 'true'" Include="-cmakeargs &quot;-DCDAC_BUILD_TOOL_BINARY_PATH=$(RuntimeBinDir)cdac-build-tool\cdac-build-tool.dll&quot;" />
       <_CoreClrBuildArg Condition="'$(_IcuDir)' != ''" Include="-cmakeargs &quot;-DCMAKE_ICU_DIR=$(_IcuDir)&quot;" />
+      <_CoreClrBuildArg Condition="'$(_TzdDir)' != ''" Include="-cmakeargs &quot;-DCMAKE_TZD_DIR=$(_TzdDir)&quot;" />
       <_CoreClrBuildArg Condition="'$(FeatureXplatEventSource)' == 'false'" Include="-cmakeargs &quot;-DFEATURE_EVENTSOURCE_XPLAT=0&quot;" />
     </ItemGroup>
 

src/coreclr/vm/peimage.inl

@@ -165,7 +165,11 @@ inline BOOL PEImage::HasLoadedLayout()
 {
     LIMITED_METHOD_CONTRACT;
     SUPPORTS_DAC;
+#ifdef PEIMAGE_FLAT_LAYOUT_ONLY
+    return m_pLayouts[IMAGE_FLAT]!=NULL;
+#else
     return m_pLayouts[IMAGE_LOADED]!=NULL;
+#endif
 }
 
 inline PTR_PEImageLayout PEImage::GetLoadedLayout()

src/native/libs/System.Native/CMakeLists.txt

@@ -135,7 +135,7 @@ if (GEN_SHARED_LIB)
     install_with_stripped_symbols (System.Native PROGRAMS .)
 endif ()
 
-if (NOT GEN_SHARED_LIB AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
+if (NOT GEN_SHARED_LIB AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID)
     set(NATIVE_SOURCES ${NATIVE_SOURCES} entrypoints.c)
 endif()
 

src/native/libs/System.Native/entrypoints.c

@@ -134,8 +134,10 @@ static const Entry s_sysNative[] =
     DllImportEntry(SystemNative_GetSpaceInfoForMountPoint)
     DllImportEntry(SystemNative_GetFileSystemTypeNameForMountPoint)
     DllImportEntry(SystemNative_GetAllMountPoints)
+#if !defined(TARGET_WASM) && !defined(TARGET_WASI)
     DllImportEntry(SystemNative_ReadEvents)
     DllImportEntry(SystemNative_CreateNetworkChangeListenerSocket)
+#endif // !defined(TARGET_WASM) && !defined(TARGET_WASI)
     DllImportEntry(SystemNative_GetHostEntryForName)
     DllImportEntry(SystemNative_FreeHostEntry)
     DllImportEntry(SystemNative_GetNameInfo)