Merge bytecodealliance:main into wenyongh:main

core/iwasm/aot/aot_runtime.c

@@ -1770,10 +1770,7 @@ aot_module_malloc(AOTModuleInstance *module_inst, uint32 size,
     if (!addr) {
         if (memory_inst->heap_handle.ptr
             && mem_allocator_is_heap_corrupted(memory_inst->heap_handle.ptr)) {
-            LOG_ERROR("Error: app heap is corrupted, if the wasm file "
-                      "is compiled by wasi-sdk-12.0 or larger version, "
-                      "please add -Wl,--export=malloc -Wl,--export=free "
-                      " to export malloc and free functions.");
+            wasm_runtime_show_app_heap_corrupted_prompt();
             aot_set_exception(module_inst, "app heap corrupted");
         }
         else {
@@ -2014,6 +2011,7 @@ aot_enlarge_memory(AOTModuleInstance *module_inst, uint32 inc_page_count)
     uint32 total_page_count, total_size_old, heap_size;
     uint64 total_size;
     uint8 *memory_data_old, *heap_data_old, *memory_data, *heap_data;
+    bool ret = true;
 
     if (!memory_inst)
         return false;
@@ -2051,6 +2049,13 @@ aot_enlarge_memory(AOTModuleInstance *module_inst, uint32 inc_page_count)
     }
 #endif
 
+    if (heap_size > 0) {
+        if (mem_allocator_is_heap_corrupted(memory_inst->heap_handle.ptr)) {
+            wasm_runtime_show_app_heap_corrupted_prompt();
+            return false;
+        }
+    }
+
     if (!(memory_data =
               wasm_runtime_realloc(memory_data_old, (uint32)total_size))) {
         if (!(memory_data = wasm_runtime_malloc((uint32)total_size))) {
@@ -2076,7 +2081,9 @@ aot_enlarge_memory(AOTModuleInstance *module_inst, uint32 inc_page_count)
                                   (char *)heap_data_old
                                       + (memory_data - memory_data_old),
                                   heap_size)) {
-            return false;
+            /* Don't return here as memory->memory_data is obsolete and
+               must be updated to be correctly used later. */
+            ret = false;
         }
     }
 
@@ -2098,7 +2105,7 @@ aot_enlarge_memory(AOTModuleInstance *module_inst, uint32 inc_page_count)
         memory_inst->mem_bound_check_8bytes.u32[0] = (uint32)total_size - 8;
         memory_inst->mem_bound_check_16bytes.u32[0] = (uint32)total_size - 16;
     }
-    return true;
+    return ret;
 }
 #else /* else of OS_ENABLE_HW_BOUND_CHECK */
 bool

core/iwasm/common/wasm_runtime_common.c

@@ -4211,3 +4211,14 @@ wasm_runtime_invoke_c_api_native(WASMModuleInstanceCommon *module_inst,
         wasm_runtime_free(results);
     return ret;
 }
+
+void
+wasm_runtime_show_app_heap_corrupted_prompt()
+{
+    LOG_ERROR("Error: app heap is corrupted, if the wasm file "
+              "is compiled by wasi-sdk-12.0 or higher version, "
+              "please add -Wl,--export=malloc -Wl,--export=free "
+              "to export malloc and free functions. If it is "
+              "compiled by asc, please add --exportRuntime to "
+              "export the runtime helpers.");
+}

core/iwasm/common/wasm_runtime_common.h

@@ -839,6 +839,9 @@ wasm_runtime_invoke_c_api_native(WASMModuleInstanceCommon *module_inst,
                                  uint32 argc, uint32 *argv, bool with_env,
                                  void *wasm_c_api_env);
 
+void
+wasm_runtime_show_app_heap_corrupted_prompt();
+
 #ifdef __cplusplus
 }
 #endif

core/iwasm/interpreter/wasm_runtime.c

@@ -1826,10 +1826,7 @@ wasm_module_malloc(WASMModuleInstance *module_inst, uint32 size,
     if (!addr) {
         if (memory->heap_handle
             && mem_allocator_is_heap_corrupted(memory->heap_handle)) {
-            LOG_ERROR("Error: app heap is corrupted, if the wasm file "
-                      "is compiled by wasi-sdk-12.0 or larger version, "
-                      "please add -Wl,--export=malloc -Wl,--export=free "
-                      " to export malloc and free functions.");
+            wasm_runtime_show_app_heap_corrupted_prompt();
             wasm_set_exception(module_inst, "app heap corrupted");
         }
         else {
@@ -2057,6 +2054,7 @@ wasm_enlarge_memory(WASMModuleInstance *module, uint32 inc_page_count)
     uint8 *new_memory_data, *memory_data, *heap_data_old;
     uint32 heap_size, total_size_old, total_page_count;
     uint64 total_size;
+    bool ret = true;
 
     if (!memory)
         return false;
@@ -2090,6 +2088,13 @@ wasm_enlarge_memory(WASMModuleInstance *module, uint32 inc_page_count)
     }
 #endif
 
+    if (heap_size > 0) {
+        if (mem_allocator_is_heap_corrupted(memory->heap_handle)) {
+            wasm_runtime_show_app_heap_corrupted_prompt();
+            return false;
+        }
+    }
+
     if (!(new_memory_data =
               wasm_runtime_realloc(memory_data, (uint32)total_size))) {
         if (!(new_memory_data = wasm_runtime_malloc((uint32)total_size))) {
@@ -2111,7 +2116,9 @@ wasm_enlarge_memory(WASMModuleInstance *module, uint32 inc_page_count)
                                       + (new_memory_data - memory_data),
                                   heap_size)
             != 0) {
-            return false;
+            /* Don't return here as memory->memory_data is obsolete and
+               must be updated to be correctly used later. */
+            ret = false;
         }
     }
 
@@ -2122,7 +2129,7 @@ wasm_enlarge_memory(WASMModuleInstance *module, uint32 inc_page_count)
     memory->memory_data_end =
         memory->memory_data + memory->num_bytes_per_page * total_page_count;
 
-    return true;
+    return ret;
 }
 
 #if WASM_ENABLE_REF_TYPES != 0

core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/include/wasmtime_ssp.h

@@ -9,6 +9,12 @@
  * around to avoid storing them in TLS.
  */
 
+/**
+ * The defitions of type, macro and structure in this file should be
+ * consistent with those in wasi-libc:
+ * https://github.com/WebAssembly/wasi-libc/blob/main/libc-bottom-half/headers/public/wasi/api.h
+ */
+
 #ifndef WASMTIME_SSP_H
 #define WASMTIME_SSP_H
 
@@ -201,8 +207,10 @@ typedef uint16_t __wasi_riflags_t;
 
 typedef uint64_t __wasi_rights_t;
 
-// Observe that WASI defines rights in the plural form
-// TODO - re-factor to use RIGHTS instead of RIGHT
+/**
+ * Observe that WASI defines rights in the plural form
+ * TODO: refactor to use RIGHTS instead of RIGHT
+ */
 #define __WASI_RIGHT_FD_DATASYNC ((__wasi_rights_t)(1 << 0))
 #define __WASI_RIGHT_FD_READ ((__wasi_rights_t)(1 << 1))
 #define __WASI_RIGHT_FD_SEEK ((__wasi_rights_t)(1 << 2))

core/shared/mem-alloc/ems/ems_alloc.c

@@ -235,12 +235,12 @@ gci_add_fc(gc_heap_t *heap, hmu_t *hmu, gc_size_t size)
         return true;
     }
 
-    /* big block*/
+    /* big block */
     node = (hmu_tree_node_t *)hmu;
     node->size = size;
     node->left = node->right = node->parent = NULL;
 
-    /* find proper node to link this new node to*/
+    /* find proper node to link this new node to */
     root = &heap->kfc_tree_root;
     tp = root;
     bh_assert(tp->size < size);
@@ -253,7 +253,7 @@ gci_add_fc(gc_heap_t *heap, hmu_t *hmu, gc_size_t size)
             }
             tp = tp->right;
         }
-        else { /* tp->size >= size*/
+        else { /* tp->size >= size */
             if (!tp->left) {
                 tp->left = node;
                 node->parent = tp;
@@ -759,7 +759,7 @@ gci_dump(gc_heap_t *heap)
         else if (ut == HMU_FC)
             inuse = 'F';
 
-        if (size == 0) {
+        if (size == 0 || size > (uint8 *)end - (uint8 *)cur) {
             os_printf("[GC_ERROR]Heap is corrupted, heap dump failed.\n");
             heap->is_heap_corrupted = true;
             return;
@@ -779,5 +779,8 @@ gci_dump(gc_heap_t *heap)
         i++;
     }
 
-    bh_assert(cur == end);
+    if (cur != end) {
+        os_printf("[GC_ERROR]Heap is corrupted, heap dump failed.\n");
+        heap->is_heap_corrupted = true;
+    }
 }

core/shared/mem-alloc/ems/ems_kfc.c

@@ -183,6 +183,11 @@ gc_migrate(gc_handle_t handle, char *pool_buf_new, gc_size_t pool_buf_size)
     if (offset == 0)
         return 0;
 
+    if (heap->is_heap_corrupted) {
+        os_printf("[GC_ERROR]Heap is corrupted, heap migrate failed.\n");
+        return GC_ERROR;
+    }
+
     heap->base_addr = (uint8 *)base_addr_new;
     adjust_ptr((uint8 **)&heap->kfc_tree_root.left, offset);
     adjust_ptr((uint8 **)&heap->kfc_tree_root.right, offset);
@@ -193,7 +198,12 @@ gc_migrate(gc_handle_t handle, char *pool_buf_new, gc_size_t pool_buf_size)
 
     while (cur < end) {
         size = hmu_get_size(cur);
-        bh_assert(size > 0);
+
+        if (size <= 0 || size > (uint8 *)end - (uint8 *)cur) {
+            os_printf("[GC_ERROR]Heap is corrupted, heap migrate failed.\n");
+            heap->is_heap_corrupted = true;
+            return GC_ERROR;
+        }
 
         if (hmu_get_ut(cur) == HMU_FC && !HMU_IS_FC_NORMAL(size)) {
             tree_node = (hmu_tree_node_t *)cur;
@@ -207,7 +217,12 @@ gc_migrate(gc_handle_t handle, char *pool_buf_new, gc_size_t pool_buf_size)
         cur = (hmu_t *)((char *)cur + size);
     }
 
-    bh_assert(cur == end);
+    if (cur != end) {
+        os_printf("[GC_ERROR]Heap is corrupted, heap migrate failed.\n");
+        heap->is_heap_corrupted = true;
+        return GC_ERROR;
+    }
+
     return 0;
 }
 

doc/build_wamr.md

@@ -302,11 +302,8 @@ Zephyr
 You need to download the Zephyr source code first and embed WAMR into it.
 ``` Bash
 git clone https://github.com/zephyrproject-rtos/zephyr.git
-cd zephyr/samples/
-cp -a <wamr_root_dir>/product-mini/platforms/zephyr/simple .
-cd simple
-ln -s <wamr_root_dir> wamr
-source ../../zephyr-env.sh
+source ../zephyr-env.sh
+cd <wamr_root_dir>/product-mini/platforms/zephyr/simple
 # Execute the ./build_and_run.sh script with board name as parameter. Here take x86 as example:
 ./build_and_run.sh x86
 

product-mini/platforms/zephyr/simple/CMakeLists.txt

@@ -3,8 +3,8 @@
 
 cmake_minimum_required(VERSION 3.8.2)
 
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
-project(NONE)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(wamr)
 
 enable_language (ASM)
 
@@ -40,7 +40,7 @@ if (WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64" OR WAMR_BUILD_TARGET STREQUAL "RIS
   set (WAMR_BUILD_FAST_INTERP 1)
 endif ()
 
-set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wamr)
+set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 
 include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
 

product-mini/platforms/zephyr/simple/build_and_run.sh

@@ -37,14 +37,12 @@ case $TARGET in
         $X86_TARGET)
                 west build -b qemu_x86_nommu \
                            . -p always -- \
-                           -DCONF_FILE=prj_qemu_x86_nommu.conf \
                            -DWAMR_BUILD_TARGET=X86_32
                 west build -t run
                 ;;
         $STM32_TARGET)
                 west build -b nucleo_f767zi \
                            . -p always -- \
-                           -DCONF_FILE=prj_nucleo767zi.conf \
                            -DWAMR_BUILD_TARGET=THUMBV7
                 west flash
                 ;;
@@ -53,7 +51,6 @@ case $TARGET in
                 west build -b esp32 \
                            . -p always -- \
                            -DESP_IDF_PATH=$ESP_IDF_PATH \
-                           -DCONF_FILE=prj_esp32.conf \
                            -DWAMR_BUILD_TARGET=XTENSA
                 # suppose the serial port is /dev/ttyUSB1 and you should change to
                 # the real name accordingly
@@ -62,37 +59,32 @@ case $TARGET in
         $QEMU_XTENSA_TARGET)
                 west build -b qemu_xtensa \
                            . -p always -- \
-                           -DCONF_FILE=prj_qemu_xtensa.conf \
                            -DWAMR_BUILD_TARGET=XTENSA
                 west build -t run
                 ;;
         $QEMU_CORTEX_A53)
                 west build -b qemu_cortex_a53 \
                            . -p always -- \
-                           -DCONF_FILE=prj_qemu_cortex_a53.conf \
                            -DWAMR_BUILD_TARGET=AARCH64
                 west build -t run
                 ;;
         $QEMU_RISCV64_TARGET)
                 west build -b qemu_riscv64 \
                             . -p always -- \
-                            -DCONF_FILE=prj_qemu_riscv64.conf \
                             -DWAMR_BUILD_TARGET=RISCV64_LP64 \
                             -DWAMR_BUILD_AOT=0
                 west build -t run
                 ;;
         $QEMU_RISCV32_TARGET)
                 west build -b qemu_riscv32 \
                             . -p always -- \
-                            -DCONF_FILE=prj_qemu_riscv32.conf \
                             -DWAMR_BUILD_TARGET=RISCV32_ILP32 \
                             -DWAMR_BUILD_AOT=0
                 west build -t run
                 ;;
         $QEMU_ARC_TARGET)
                 west build -b qemu_arc_em \
                             . -p always -- \
-                            -DCONF_FILE=prj_qemu_arc.conf \
                             -DWAMR_BUILD_TARGET=ARC \
                             -DWAMR_BUILD_AOT=0
                 west build -t run