allow enable both LIBC_WASI and LIBC_BUILTIN

Author: lum1n0us

core/iwasm/common/wasm_application.c

@@ -100,18 +100,15 @@ wasm_application_execute_main(WASMModuleInstanceCommon *module_inst, int32 argc,
         return wasm_runtime_create_exec_env_and_call_wasm(module_inst, func, 0,
                                                           NULL);
     }
-    else {
-        wasm_runtime_set_exception(
-            module_inst, "lookup _start function failed, may run with \'-f\'");
-        return false;
-    }
 #endif /* end of WASM_ENABLE_LIBC_WASI */
 
     if (!(func = wasm_runtime_lookup_function(module_inst, "main", NULL))
         && !(func = wasm_runtime_lookup_function(module_inst,
                                                  "__main_argc_argv", NULL))
         && !(func = wasm_runtime_lookup_function(module_inst, "_main", NULL))) {
-        wasm_runtime_set_exception(module_inst, "lookup main function failed");
+        wasm_runtime_set_exception(
+            module_inst,
+            "lookup the entry point symbol(like _start, _main, _main) failed");
         return false;
     }
 
@@ -244,9 +241,9 @@ resolve_function(WASMModuleInstanceCommon *module_inst, const char *name,
 {
     WASMFunctionInstanceCommon *target_func = NULL;
     WASMModuleInstanceCommon *target_inst = NULL;
-    char *function_name = NULL;
 
 #if WASM_ENABLE_MULTI_MODULE != 0
+    char *function_name = NULL;
     char *orig_name = NULL;
     char *sub_module_name = NULL;
     uint32 length = (uint32)(strlen(name) + 1);
@@ -276,7 +273,7 @@ resolve_function(WASMModuleInstanceCommon *module_inst, const char *name,
         target_inst = module_inst;
     }
 #else
-    function_name = name;
+    const char *function_name = name;
     target_inst = module_inst;
 #endif
 

core/iwasm/common/wasm_runtime_common.h

@@ -447,7 +447,7 @@ wasm_runtime_deinstantiate(WASMModuleInstanceCommon *module_inst);
 
 /* See wasm_export.h for description */
 WASM_RUNTIME_API_EXTERN WASMFunctionInstanceCommon *
-wasm_runtime_lookup_function(WASMModuleInstanceCommon *module_inst,
+wasm_runtime_lookup_function(WASMModuleInstanceCommon *const module_inst,
                              const char *name, const char *signature);
 
 /* Internal API */

core/iwasm/interpreter/wasm_loader.c

@@ -3472,6 +3472,9 @@ check_wasi_abi_compatibility(const WASMModule *module, bool main_module,
      * if a module doesn't depends on any library, it imports nothing.
      * and its `is_wasi_module` flag is false. but still export below entries.
      */
+    if (!module->is_wasi_module) {
+        return true;
+    }
 
     if (main_module) {
         start = wasm_loader_find_export(module, "", "_start", EXPORT_KIND_FUNC,

core/iwasm/interpreter/wasm_runtime.c

@@ -1038,19 +1038,14 @@ sub_module_instantiate(WASMModule *module, WASMModuleInstance *module_inst,
              * reactor instances may assume that _initialize will be called by
              * the environment at most once, and that none of their other
              * exports are accessed before that call.
+             *
+             * let the loader decide how to act if there is no _initialize
+             * in a reactor
              */
             WASMFunctionInstance *initialize =
                 wasm_lookup_function(sub_module_inst, "_initialize", NULL);
-            /* a strong restricttion that a reactor must export a _initialize
-             * function */
-            if (!initialize) {
-                set_error_buf(error_buf, error_buf_size,
-                              "The reactors(sub-modules) must export a "
-                              "_initialize function");
-                goto failed;
-            }
-
-            if (!wasm_create_exec_env_and_call_function(
+            if (initialize
+                && !wasm_create_exec_env_and_call_function(
                     sub_module_inst, initialize, 0, NULL, false)) {
                 set_error_buf(error_buf, error_buf_size,
                               "Call _initialize failed ");

product-mini/platforms/linux-sgx/enclave-sample/Makefile

@@ -102,7 +102,6 @@ Enclave_Include_Paths := -IEnclave -I$(WAMR_ROOT)/core/iwasm/include \
 Enclave_C_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(Enclave_Include_Paths)
 ifeq ($(SPEC_TEST), 1)
 	Enclave_C_Flags += -DWASM_ENABLE_SPEC_TEST=1
-	Enclave_C_Flags += -DSGX_DISABLE_WASI
 else
 	Enclave_C_Flags += -DWASM_ENABLE_SPEC_TEST=0
 endif

samples/multi-module/CMakeLists.txt

@@ -40,7 +40,7 @@ endif ()
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_AOT 0)
 set(WAMR_BUILD_JIT 0)
-set(WAMR_BUILD_LIBC_BUILTIN 0)
+set(WAMR_BUILD_LIBC_BUILTIN 1)
 set(WAMR_BUILD_LIBC_WASI 1)
 set(WAMR_BUILD_MULTI_MODULE 1)
 

samples/multi-module/wasm-apps/CMakeLists.txt

@@ -52,7 +52,7 @@ function(COMPILE_WITH_CLANG SOURCE_FILE COMMAND)
   get_filename_component(FILE_NAME ${SOURCE_FILE} NAME_WLE)
 
   set(WASM_MODULE ${FILE_NAME}.wasm)
-  
+
   set(MAIN_TARGET_NAME MODULE_${FILE_NAME})
 
   add_executable(${MAIN_TARGET_NAME} ${SOURCE_FILE})
@@ -64,7 +64,7 @@ function(COMPILE_WITH_CLANG SOURCE_FILE COMMAND)
     message(STATUS "Generating ${WASM_MODULE} as REACTOR...")
     target_link_options(${MAIN_TARGET_NAME} PRIVATE -mexec-model=reactor)
   endif()
-  
+
   if(EXISTS ${WASM2WAT})
     message(STATUS "Dumping ${WASM_MODULE}...")
     set(WASM_WAT ${FILE_NAME}.wat)

tests/wamr-test-suites/test_wamr.sh

@@ -527,7 +527,6 @@ function trigger()
     local EXTRA_COMPILE_FLAGS=""
     # default enabled features
     EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_BULK_MEMORY=1"
-    EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_LIBC_WASI=0"
 
     if [[ ${ENABLE_MULTI_MODULE} == 1 ]];then
         EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_MULTI_MODULE=1"