Update Wasm3

vshymanskyy · vshymanskyy · commit f27a97403241 · 2021-05-28T22:30:41.000+03:00
diff --git a/examples/Wasm_Blink/Wasm_Blink.ino b/examples/Wasm_Blink/Wasm_Blink.ino
@@ -6,9 +6,6 @@
 
 #include <wasm3.h>
 
-#include <m3_api_defs.h>
-#include <m3_env.h>
-
 /*
  * Configuration
  */
diff --git a/examples/Wasm_CoreMark/Wasm_CoreMark.ino b/examples/Wasm_CoreMark/Wasm_CoreMark.ino
@@ -5,8 +5,6 @@
  */
 
 #include <wasm3.h>
-#include <m3_api_defs.h>
-#include <m3_env.h>
 
 #include "coremark_minimal.wasm.h"
 
diff --git a/examples/Wasm_Dino_ESP32_TDisplay/Wasm_Dino_ESP32_TDisplay.ino b/examples/Wasm_Dino_ESP32_TDisplay/Wasm_Dino_ESP32_TDisplay.ino
@@ -9,7 +9,6 @@
 #include "NotoSansBold15.h"
 
 #include <wasm3.h>
-#include <m3_api_defs.h>
 
 #define NATIVE_STACK_SIZE   (32*1024)
 
diff --git a/examples/Wasm_Dino_PyBadge/Wasm_Dino_PyBadge.ino b/examples/Wasm_Dino_PyBadge/Wasm_Dino_PyBadge.ino
@@ -7,7 +7,6 @@
 #include "Adafruit_Arcada.h"
 
 #include <wasm3.h>
-#include <m3_api_defs.h>
 
 #define DISPLAY_BRIGHTESS   128    // 0..255
 
diff --git a/examples/Wasm_Fibonacci/Wasm_Fibonacci.ino b/examples/Wasm_Fibonacci/Wasm_Fibonacci.ino
@@ -5,7 +5,6 @@
  */
 
 #include <wasm3.h>
-#include <m3_config.h>
 
 /*
  * WebAssembly app (recursive Fibonacci)
diff --git a/examples_pio/Wasm_Advanced/wasm_vm/wasm_vm.ino b/examples_pio/Wasm_Advanced/wasm_vm/wasm_vm.ino
@@ -6,7 +6,6 @@
 
 #include <wasm3.h>
 
-#include <m3_api_defs.h>
 #include <m3_env.h>
 
 /*
diff --git a/src/m3_api_defs.h b/src/m3_api_defs.h
diff --git a/src/m3_compile.c b/src/m3_compile.c
@@ -641,6 +641,8 @@ _           (PushAllocatedSlotAndEmit (o, i_type));
         {
             u16 constTableIndex = slot - o->slotFirstConstIndex;
 
+            d_m3Assert(constTableIndex < d_m3MaxConstantTableSize);
+
             if (is64BitType)
             {
                 u64 * constant = (u64 *) & o->constants [constTableIndex];
diff --git a/src/m3_config.h b/src/m3_config.h
@@ -33,7 +33,7 @@
 # endif
 
 # ifndef d_m3MaxConstantTableSize
-#   define d_m3MaxConstantTableSize             120
+#   define d_m3MaxConstantTableSize             1024
 # endif
 
 # ifndef d_m3MaxDuplicateFunctionImpl
diff --git a/src/m3_config_platforms.h b/src/m3_config_platforms.h
@@ -65,10 +65,13 @@
 
 # if defined(M3_COMPILER_MSVC)
 #  define M3_WEAK //__declspec(selectany)
+#  define M3_NO_UBSAN
 # elif defined(__MINGW32__)
 #  define M3_WEAK //__attribute__((selectany))
+#  define M3_NO_UBSAN
 # else
-#  define M3_WEAK __attribute__((weak))
+#  define M3_WEAK       __attribute__((weak))
+#  define M3_NO_UBSAN   __attribute__((no_sanitize("undefined")))
 # endif
 
 # ifndef M3_MIN
@@ -163,6 +166,9 @@ typedef int8_t          i8;
 #  ifndef d_m3VerboseErrorMessages
 #    define d_m3VerboseErrorMessages            0
 #  endif
+# ifndef d_m3MaxConstantTableSize
+#   define d_m3MaxConstantTableSize             64
+# endif
 #  ifndef d_m3MaxFunctionStackHeight
 #    define d_m3MaxFunctionStackHeight          64
 #  endif
diff --git a/src/m3_exec_defs.h b/src/m3_exec_defs.h
@@ -45,7 +45,7 @@ d_m3BeginExternC
 typedef m3ret_t (vectorcall * IM3Operation) (d_m3OpSig);
 
 #define d_m3RetSig                  static inline m3ret_t vectorcall
-#define d_m3Op(NAME)                op_section d_m3RetSig op_##NAME (d_m3OpSig)
+#define d_m3Op(NAME)                M3_NO_UBSAN op_section d_m3RetSig op_##NAME (d_m3OpSig)
 
 #define nextOpImpl()                ((IM3Operation)(* _pc))(_pc + 1, d_m3OpArgs)
 #define jumpOpImpl(PC)              ((IM3Operation)(*  PC))( PC + 1, d_m3OpArgs)
diff --git a/src/wasm3.h b/src/wasm3.h
@@ -9,9 +9,9 @@
 #define wasm3_h
 
 #define M3_VERSION_MAJOR 0
-#define M3_VERSION_MINOR 4
-#define M3_VERSION_REV   9
-#define M3_VERSION       "0.4.9"
+#define M3_VERSION_MINOR 5
+#define M3_VERSION_REV   0
+#define M3_VERSION       "0.5.0"
 
 #include <stdlib.h>
 #include <stdint.h>

Original file line number	Diff line number	Diff line change
`@@ -641,6 +641,8 @@ _ (PushAllocatedSlotAndEmit (o, i_type));`
`641`	`641`	`{`
`642`	`642`	`u16 constTableIndex = slot - o->slotFirstConstIndex;`
`643`	`643`
	`644`	`+ d_m3Assert(constTableIndex < d_m3MaxConstantTableSize);`
	`645`	`+`
`644`	`646`	`if (is64BitType)`
`645`	`647`	`{`
`646`	`648`	`u64 * constant = (u64 *) & o->constants [constTableIndex];`