Cleanup

platforms/embedded/bluepill/lib/wasm3

@@ -1 +0,0 @@
-../../../../source

platforms/embedded/bluepill/lib/wasm3/library.json

@@ -0,0 +1,7 @@
+{
+    "build" : {
+        "flags": "-Os -fomit-frame-pointer -fno-stack-check -fno-stack-protector -Wfatal-errors -Wno-unused-function -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers",
+        "srcFilter": ["+<*>", "-<extensions/*>"],
+        "libArchive": false
+    }
+}

platforms/embedded/bluepill/lib/wasm3/src

@@ -0,0 +1 @@
+../../../../../source

platforms/embedded/bluepill/platformio.ini

@@ -5,11 +5,6 @@ framework = stm32cube
 upload_protocol = stlink
 lib_deps = jeeh
 
-src_filter =
-  +<*>
-  -<m3/extensions/*>
-
-src_build_flags =
+build_flags =
   -Dd_m3FixedHeap=8192
   -Os -Wfatal-errors
-  -flto

platforms/embedded/bluepill/src/main.cpp

@@ -49,9 +49,14 @@ void run_wasm()
 
     uint32_t value = 0;
     result = m3_GetResultsV (f, &value);
-    if (result) FATAL("m3_GetResults: %s", result);
+    if (result) FATAL("m3_GetResults", result);
 
-    printf("Result: %d\n", value);
+    char buff[32];
+    itoa(value, buff, 10);
+
+    puts("Result: ");
+    puts(buff);
+    puts("\n");
 }
 
 PinC<13> led;

platforms/embedded/fomu/src/main.c

@@ -73,11 +73,11 @@ bool run_wasm()
     uart_print("Running...\n");
 
     result = m3_CallV (f, 24);
-    if (result) FATAL("m3_Call: %s", result);
+    if (result) FATAL("m3_Call", result);
 
     uint32_t value = 0;
     result = m3_GetResultsV (f, &value);
-    if (result) FATAL("m3_GetResults: %s", result);
+    if (result) FATAL("m3_GetResults", result);
 
     char buff[32];
     ltoa(value, buff, 10);

source/m3_config_platforms.h

@@ -71,7 +71,7 @@
 #  define M3_NO_UBSAN
 # else
 #  define M3_WEAK       __attribute__((weak))
-#  define M3_NO_UBSAN   __attribute__((no_sanitize("undefined")))
+#  define M3_NO_UBSAN   //__attribute__((no_sanitize("undefined")))
 # endif
 
 # ifndef M3_MIN