Cleanup

platforms/cpp/wasm3_cpp/include/wasm3_cpp.h

@@ -44,12 +44,12 @@ namespace wasm3 {
             static const char value = c;
         };
         template<typename T> struct m3_type_to_sig;
-        template<> struct m3_type_to_sig<i32> : m3_sig<'i'> {};
-        template<> struct m3_type_to_sig<i64> : m3_sig<'I'> {};
-        template<> struct m3_type_to_sig<f32> : m3_sig<'f'> {};
-        template<> struct m3_type_to_sig<f64> : m3_sig<'F'> {};
-        template<> struct m3_type_to_sig<void> : m3_sig<'v'> {};
-        template<> struct m3_type_to_sig<void *> : m3_sig<'*'> {};
+        template<> struct m3_type_to_sig<int32_t> : m3_sig<'i'> {};
+        template<> struct m3_type_to_sig<int64_t> : m3_sig<'I'> {};
+        template<> struct m3_type_to_sig<float>   : m3_sig<'f'> {};
+        template<> struct m3_type_to_sig<double>  : m3_sig<'F'> {};
+        template<> struct m3_type_to_sig<void>    : m3_sig<'v'> {};
+        template<> struct m3_type_to_sig<void *>  : m3_sig<'*'> {};
         template<> struct m3_type_to_sig<const void *> : m3_sig<'*'> {};
 
 

platforms/embedded/arduino/src/main.cpp

@@ -7,9 +7,9 @@
 
 #include "Arduino.h"
 
-#include "m3/wasm3.h"
+#include "wasm3.h"
 
-#include "m3/extra/fib32.wasm.h"
+#include "extra/fib32.wasm.h"
 
 #define FATAL(func, msg) {           \
   Serial.print("Fatal: " func ": "); \

platforms/embedded/bluepill/src/main.cpp

@@ -5,9 +5,9 @@
 //  All rights reserved.
 //
 
-#include "m3/wasm3.h"
+#include "wasm3.h"
 
-#include "m3/extra/fib32.wasm.h"
+#include "extra/fib32.wasm.h"
 
 #include <stdio.h>
 #include <jee.h>

platforms/embedded/esp8266/src/main.cpp

@@ -8,9 +8,9 @@
 #include "Arduino.h"
 
 #include <stdio.h>
-#include "m3/wasm3.h"
+#include "wasm3.h"
 
-#include "m3/extra/fib32.wasm.h"
+#include "extra/fib32.wasm.h"
 
 #define FATAL(msg, ...) { printf("Fatal: " msg "\n", ##__VA_ARGS__); return; }
 

platforms/embedded/hifive1/src/main.c

@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "m3/wasm3.h"
+#include "wasm3.h"
 
-#include "m3/extra/fib32.wasm.h"
+#include "extra/fib32.wasm.h"
 
 #define FATAL(msg, ...) { printf("Fatal: " msg "\n", ##__VA_ARGS__); return; }
 

platforms/embedded/wm_w600/Makefile

@@ -18,7 +18,7 @@ sinclude $(TOP_DIR)/tools/tool_chain.def
 
 USE_LIB=1
 
-CSRCS = $(wildcard *.c) $(wildcard m3/*.c)
+CSRCS = $(wildcard *.c) $(wildcard wasm3/*.c)
 
 #EXTRA_CCFLAGS += -u
 ifndef PDIR

platforms/embedded/wm_w600/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 rm -rf .output
 
-mkdir -p .output/wasm3/obj/m3/
+mkdir -p .output/wasm3/obj/wasm3/
 
 make COMPILE=gcc TARGET=wasm3 FLASH_SIZE=1M VERBOSE=YES