Cleanup

Author: vshymanskyy

examples/Wasm_Blink/Wasm_Blink.ino

@@ -132,11 +132,6 @@ m3ApiRawFunction(m3_arduino_print)
     m3ApiSuccess();
 }
 
-m3ApiRawFunction(m3_dummy)
-{
-    m3ApiSuccess();
-}
-
 M3Result  LinkArduino  (IM3Runtime runtime)
 {
     IM3Module module = runtime->modules;
@@ -151,9 +146,6 @@ M3Result  LinkArduino  (IM3Runtime runtime)
     m3_LinkRawFunction (module, arduino, "getPinLED",        "i()",    &m3_arduino_getPinLED);
     m3_LinkRawFunction (module, arduino, "print",            "v(*i)",  &m3_arduino_print);
 
-    // Dummy (for TinyGo)
-    m3_LinkRawFunction (module, "env",   "io_get_stdout",    "i()",    &m3_dummy);
-
     return m3Err_none;
 }
 
@@ -188,13 +180,7 @@ void wasm_task(void*)
     if (result) FATAL("LinkArduino", result);
 
     IM3Function f;
-    // Check for TinyGo entry function first
-    // See https://github.com/tinygo-org/tinygo/issues/866
-    result = m3_FindFunction (&f, runtime, "cwa_main");
-    if (result) {
-        result = m3_FindFunction (&f, runtime, "_start");
-    }
-
+    result = m3_FindFunction (&f, runtime, "_start");
     if (result) FATAL("FindFunction", result);
 
     Serial.println("Running WebAssembly...");

examples/Wasm_Dino_ESP32_TDisplay/Wasm_Dino_ESP32_TDisplay.ino

@@ -129,7 +129,7 @@ void display_info()
     tft.setCursor(0, 5);
     tft.println("  Wasm3 v" M3_VERSION " (ESP32)");
     tft.println("  Dino game");
-    tft.println("  by Ben Smith (binji)");    
+    tft.println("  by Ben Smith (binji)");
 }
 
 void setup()

examples_pio/Wasm_Advanced/wasm_vm/wasm_vm.ino

@@ -125,11 +125,6 @@ m3ApiRawFunction(m3_arduino_getGreeting)
     m3ApiSuccess();
 }
 
-m3ApiRawFunction(m3_dummy)
-{
-    m3ApiSuccess();
-}
-
 M3Result  LinkArduino  (IM3Runtime runtime)
 {
     IM3Module module = runtime->modules;
@@ -145,9 +140,6 @@ M3Result  LinkArduino  (IM3Runtime runtime)
     m3_LinkRawFunction (module, arduino, "getGreeting",      "v(*i)",  &m3_arduino_getGreeting);
     m3_LinkRawFunction (module, arduino, "print",            "v(*i)",  &m3_arduino_print);
 
-    // Dummy (for TinyGo)
-    m3_LinkRawFunction (module, "env",   "io_get_stdout",    "i()",    &m3_dummy);
-
     return m3Err_none;
 }
 
@@ -182,19 +174,12 @@ void wasm_task(void*)
     if (result) FATAL("LinkArduino", result);
 
     IM3Function f;
-    // Check for TinyGo entry function first
-    // See https://github.com/tinygo-org/tinygo/issues/866
-    result = m3_FindFunction (&f, runtime, "cwa_main");
-    if (result) {
-        result = m3_FindFunction (&f, runtime, "_start");
-    }
-
+    result = m3_FindFunction (&f, runtime, "_start");
     if (result) FATAL("FindFunction", result);
 
     Serial.println("Running WebAssembly...");
 
-    const char* i_argv[1] = { NULL };
-    result = m3_CallWithArgs (f, 0, i_argv);
+    result = m3_CallV (f);
 
     // Should not arrive here
 

wasm_apps/README.md

@@ -24,8 +24,8 @@ To rebuild, use `npm run build`.
 
 ## TinyGo app
 
-To rebuild, use `build.sh`.  
-When using TinyGo, be sure to change the main function from `_start` to `cwa_main`.
+To rebuild, use `build.sh`.
 
+___
 
 **Note:** for all examples, the resulting `wasm` binary is converted to a C header using `xxd`.