configure wasi via InstantiationArgs2 for platforms using libc_wasi.c

Author: yamt

product-mini/platforms/common/libc_wasi.c

@@ -175,3 +175,19 @@ libc_wasi_init(wasm_module_t wasm_module, int argc, char **argv,
     wasm_runtime_set_wasi_ns_lookup_pool(wasm_module, ctx->ns_lookup_pool,
                                          ctx->ns_lookup_pool_size);
 }
+
+static void
+libc_wasi_set_init_args(struct InstantiationArgs2 *args, int argc, char **argv,
+                        libc_wasi_parse_context_t *ctx)
+{
+    wasm_runtime_instantiation_args_set_wasi_arg(args, argv, argc);
+    wasm_runtime_instantiation_args_set_wasi_env(args, ctx->env_list,
+                                                 ctx->env_list_size);
+    wasm_runtime_instantiation_args_set_wasi_dir(
+        args, ctx->dir_list, ctx->dir_list_size, ctx->map_dir_list,
+        ctx->map_dir_list_size);
+    wasm_runtime_instantiation_args_set_wasi_addr_pool(args, ctx->addr_pool,
+                                                       ctx->addr_pool_size);
+    wasm_runtime_instantiation_args_set_wasi_ns_lookup_pool(
+        args, ctx->ns_lookup_pool, ctx->ns_lookup_pool_size);
+}

product-mini/platforms/posix/main.c

@@ -962,10 +962,6 @@ main(int argc, char *argv[])
     }
 #endif
 
-#if WASM_ENABLE_LIBC_WASI != 0
-    libc_wasi_init(wasm_module, argc, argv, &wasi_parse_ctx);
-#endif
-
     if (!wasm_runtime_instantiation_args_create(&inst_args)) {
         printf("failed to create instantiate args\n");
         goto fail3;
@@ -974,6 +970,9 @@ main(int argc, char *argv[])
                                                            stack_size);
     wasm_runtime_instantiation_args_set_host_managed_heap_size(inst_args,
                                                                heap_size);
+#if WASM_ENABLE_LIBC_WASI != 0
+    libc_wasi_set_init_args(inst_args, argc, argv, &wasi_parse_ctx);
+#endif
 
     /* instantiate the module */
     wasm_module_inst = wasm_runtime_instantiate_ex2(

product-mini/platforms/windows/main.c

@@ -598,10 +598,6 @@ main(int argc, char *argv[])
         goto fail2;
     }
 
-#if WASM_ENABLE_LIBC_WASI != 0
-    libc_wasi_init(wasm_module, argc, argv, &wasi_parse_ctx);
-#endif
-
     if (!wasm_runtime_instantiation_args_create(&inst_args)) {
         printf("failed to create instantiate args\n");
         goto fail3;
@@ -610,6 +606,9 @@ main(int argc, char *argv[])
                                                            stack_size);
     wasm_runtime_instantiation_args_set_host_managed_heap_size(inst_args,
                                                                heap_size);
+#if WASM_ENABLE_LIBC_WASI != 0
+    libc_wasi_set_init_args(inst_args, argc, argv, &wasi_parse_ctx);
+#endif
 
     /* instantiate the module */
     wasm_module_inst = wasm_runtime_instantiate_ex2(