Initial WASI support wasm3#7

Author: vshymanskyy

platforms/app/main.c

@@ -3,10 +3,10 @@
 #include <time.h>
 
 #include "m3.h"
-#include "m3_host.h"
+#include "m3_api_wasi.h"
 #include "m3_env.h"
 
-#define FATAL(msg, ...) { printf("Fatal: " msg "\n", ##__VA_ARGS__); return 1; }
+#define FATAL(msg, ...) { printf("Error: [Fatal] " msg "\n", ##__VA_ARGS__); goto _onfatal; }
 
 int  main  (int i_argc, const char * i_argv [])
 {
@@ -31,32 +31,23 @@ int  main  (int i_argc, const char * i_argv [])
         wasm = (u8*) malloc(fsize);
         fread (wasm, 1, fsize, f);
         fclose (f);
+    } else {
+    	FATAL("cannot open file");
     }
 
     IM3Module module;
     result = m3_ParseModule (& module, wasm, fsize);
     if (result) FATAL("m3_ParseModule: %s", result);
 
+    // TODO: Detect stack exhaustion
     IM3Runtime env = m3_NewRuntime (4096);
     if (!env) FATAL("m3_NewRuntime");
 
     result = m3_LoadModule (env, module);
     if (result) FATAL("m3_LoadModule: %s", result);
 
-    /*
-    m3_LinkFunction (module, "_m3TestOut", "v(iFi)", (void *) m3TestOut);
-    m3_LinkFunction (module, "_m3StdOut", "v(*)", (void *) m3Output);
-    m3_LinkFunction (module, "_m3Export", "v(*i)", (void *) m3Export);
-    m3_LinkFunction (module, "_m3Out_f64", "v(F)", (void *) m3Out_f64);
-    m3_LinkFunction (module, "_m3Out_i32", "v(i)", (void *) m3Out_i32);
-    m3_LinkFunction (module, "_TestReturn", "F(i)", (void *) TestReturn);
-
-    m3_LinkFunction (module, "abortStackOverflow",    "v(i)",        (void *) m3_abort);
-
-    result = m3_LinkCStd (module); if (result) FATAL("m3_LinkCStd: %s", result);
-
-    m3_PrintRuntimeInfo (env);
-    */
+    result = m3_LinkWASI (module);
+    if (result) FATAL("m3_LinkWASI: %s", result);
 
     IM3Function func;
     result = m3_FindFunction (& func, env, "__post_instantiate");
@@ -78,6 +69,7 @@ int  main  (int i_argc, const char * i_argv [])
         i_argc -= 2;
         i_argv += 2;
         result = m3_CallMain (func, i_argc, i_argv);
+        if (result) FATAL("m3_CallMain: %s", result);
 
         m3stack_t stack = (m3stack_t)(env->stack);
         return stack[0];
@@ -91,7 +83,15 @@ int  main  (int i_argc, const char * i_argv [])
 
     free (wasm);
 
-    if (result) FATAL("m3_Call: %s", result);
+_onfatal:
+    if (result) {
+        printf ("Error: %s", result);
+        if (env)
+        {
+            M3ErrorInfo info = m3_GetErrorInfo (env);
+            printf (" (%s)", info.message);
+        }
+    }
 
     printf ("\n");