Make heap and linear memory contiguous to refine compilation time and…

… footprint

core/iwasm/aot/aot_runtime.h

@@ -18,9 +18,6 @@
 extern "C" {
 #endif
 
-#define AOT_MAGIC_NUMBER 0x746f6100
-#define AOT_CURRENT_VERSION 1
-
 typedef enum AOTExceptionID {
     EXCE_UNREACHABLE = 0,
     EXCE_OUT_OF_MEMORY,
@@ -200,19 +197,27 @@ typedef struct AOTModuleInstance {
     /* WASI context */
     AOTPointer wasi_ctx;
 
+    /* total memory size: heap and linear memory */
+    uint32 total_mem_size;
+
+    /* boundary check constants for aot code */
+    uint32 mem_bound_check_1byte;
+    uint32 mem_bound_check_2bytes;
+    uint32 mem_bound_check_4bytes;
+    uint32 mem_bound_check_8bytes;
+
     /* others */
     int32 temp_ret;
     uint32 llvm_stack;
-    int32 DYNAMICTOP_PTR_offset;
     uint32 default_wasm_stack_size;
 
     /* reserved */
-    uint32 reserved[16];
+    uint32 reserved[12];
 
     union {
         uint64 _make_it_8_byte_aligned_;
         uint8 bytes[1];
-    } global_table_heap_data;
+    } global_table_data;
 } AOTModuleInstance;
 
 typedef AOTExportFunc AOTFunctionInstance;
@@ -441,13 +446,13 @@ aot_is_wasm_type_equal(AOTModuleInstance *module_inst,
  */
 bool
 aot_invoke_native(WASMExecEnv *exec_env, uint32 func_idx,
-                  uint32 *frame_lp, uint32 argc, uint32 *argv_ret);
+                  uint32 argc, uint32 *argv);
 
 bool
 aot_call_indirect(WASMExecEnv *exec_env,
                   bool check_func_type, uint32 func_type_idx,
                   uint32 table_elem_idx,
-                  uint32 *frame_lp, uint32 argc, uint32 *argv_ret);
+                  uint32 argc, uint32 *argv);
 
 uint32
 aot_get_plt_table_size();

core/iwasm/common/wasm_native.c

@@ -162,9 +162,11 @@ wasm_native_resolve_symbol(const char *module_name, const char *field_name,
         if (signature && signature[0] != '\0') {
             /* signature is not empty, check its format */
             if (!check_symbol_signature(func_type, signature)) {
+#if WASM_ENABLE_WAMR_COMPILER == 0 /* Output warning except running aot compiler */
                 LOG_WARNING("failed to check signature '%s' and resolve "
                             "pointer params for import function (%s %s)\n",
                             signature, module_name, field_name);
+#endif
                 return NULL;
             }
             else

core/iwasm/common/wasm_runtime_common.c

@@ -810,9 +810,9 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,
         goto fail;
     }
 
-    wasi_ctx->curfds = curfds;
-    wasi_ctx->prestats = prestats;
-    wasi_ctx->argv_environ = argv_environ;
+    wasi_ctx->curfds_offset = offset_curfds;
+    wasi_ctx->prestats_offset = offset_prestats;
+    wasi_ctx->argv_environ_offset = offset_argv_environ;
 
     fd_table_init(curfds);
     fd_prestats_init(prestats);
@@ -950,14 +950,32 @@ void
 wasm_runtime_destroy_wasi(WASMModuleInstanceCommon *module_inst)
 {
     WASIContext *wasi_ctx = wasm_runtime_get_wasi_ctx(module_inst);
+    struct argv_environ_values *argv_environ;
+    struct fd_table *curfds;
+    struct fd_prestats *prestats;
 
     if (wasi_ctx) {
-        if (wasi_ctx->argv_environ)
-            argv_environ_destroy(wasi_ctx->argv_environ);
-        if (wasi_ctx->curfds)
-            fd_table_destroy(wasi_ctx->curfds);
-        if (wasi_ctx->prestats)
-            fd_prestats_destroy(wasi_ctx->prestats);
+        if (wasi_ctx->argv_environ_offset) {
+            argv_environ = (struct argv_environ_values *)
+                wasm_runtime_addr_app_to_native(module_inst,
+                                                wasi_ctx->argv_environ_offset);
+            argv_environ_destroy(argv_environ);
+            wasm_runtime_module_free(module_inst, wasi_ctx->argv_environ_offset);
+        }
+        if (wasi_ctx->curfds_offset) {
+            curfds = (struct fd_table *)
+                wasm_runtime_addr_app_to_native(module_inst,
+                                                wasi_ctx->curfds_offset);
+            fd_table_destroy(curfds);
+            wasm_runtime_module_free(module_inst, wasi_ctx->curfds_offset);
+        }
+        if (wasi_ctx->prestats_offset) {
+            prestats = (struct fd_prestats *)
+                wasm_runtime_addr_app_to_native(module_inst,
+                                                wasi_ctx->prestats_offset);
+            fd_prestats_destroy(prestats);
+            wasm_runtime_module_free(module_inst, wasi_ctx->prestats_offset);
+        }
         wasm_runtime_free(wasi_ctx);
     }
 }
@@ -2141,8 +2159,7 @@ wasm_runtime_call_indirect(WASMExecEnv *exec_env,
 #if WASM_ENABLE_AOT != 0
     if (exec_env->module_inst->module_type == Wasm_Module_AoT)
         return aot_call_indirect(exec_env, false, 0,
-                                 element_indices,
-                                 argv, argc, argv);
+                                 element_indices, argc, argv);
 #endif
     return false;
 }

core/iwasm/common/wasm_runtime_common.h

@@ -46,9 +46,13 @@ typedef struct WASMModuleInstanceCommon {
 
 #if WASM_ENABLE_LIBC_WASI != 0
 typedef struct WASIContext {
-    struct fd_table *curfds;
-    struct fd_prestats *prestats;
-    struct argv_environ_values *argv_environ;
+    /* Use offset but not native address, since these fields are
+       allocated from app's heap, and the heap space may be re-allocated
+       after memory.grow opcode is executed, the original native address
+       cannot be accessed again. */
+    int32 curfds_offset;
+    int32 prestats_offset;
+    int32 argv_environ_offset;
 } WASIContext;
 #endif
 

core/iwasm/compilation/aot_emit_aot_file.c

@@ -821,13 +821,14 @@ aot_emit_file_header(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
                      AOTCompData *comp_data, AOTObjectData *obj_data)
 {
     uint32 offset = *p_offset;
+    uint32 aot_curr_version = AOT_CURRENT_VERSION;
 
     EMIT_U8('\0');
     EMIT_U8('a');
     EMIT_U8('o');
     EMIT_U8('t');
 
-    EMIT_U32(1);
+    EMIT_U32(aot_curr_version);
 
     *p_offset = offset;
     return true;

core/iwasm/compilation/aot_emit_function.c

@@ -143,20 +143,19 @@ call_aot_invoke_native_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
                             LLVMTypeRef ret_type, uint8 wasm_ret_type,
                             LLVMValueRef *p_value_ret, LLVMValueRef *p_res)
 {
-    LLVMTypeRef func_type, func_ptr_type, func_param_types[5];
+    LLVMTypeRef func_type, func_ptr_type, func_param_types[4];
     LLVMTypeRef ret_ptr_type, elem_ptr_type;
     LLVMValueRef func, elem_idx, elem_ptr;
-    LLVMValueRef func_param_values[5], value_ret = NULL, value_ret_ptr, res;
+    LLVMValueRef func_param_values[4], value_ret = NULL, res;
     char buf[32], *func_name = "aot_invoke_native";
     uint32 i, cell_num = 0;
 
     /* prepare function type of aot_invoke_native */
     func_param_types[0] = comp_ctx->exec_env_type;  /* exec_env */
     func_param_types[1] = I32_TYPE;                 /* func_idx */
-    func_param_types[2] = INT32_PTR_TYPE;           /* frame_lp */
-    func_param_types[3] = I32_TYPE;                 /* argc */
-    func_param_types[4] = INT32_PTR_TYPE;           /* argv_ret */
-    if (!(func_type = LLVMFunctionType(INT8_TYPE, func_param_types, 5, false))) {
+    func_param_types[2] = I32_TYPE;                 /* argc */
+    func_param_types[3] = INT32_PTR_TYPE;           /* argv */
+    if (!(func_type = LLVMFunctionType(INT8_TYPE, func_param_types, 4, false))) {
         aot_set_last_error("llvm add function type failed.");
         return false;
     }
@@ -216,6 +215,24 @@ call_aot_invoke_native_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         cell_num += wasm_value_type_cell_num(aot_func_type->types[i]);
     }
 
+    func_param_values[0] = func_ctx->exec_env;
+    func_param_values[1] = func_idx;
+    func_param_values[2] = I32_CONST(param_cell_num);
+    func_param_values[3] = func_ctx->argv_buf;
+
+    if (!func_param_values[2]) {
+        aot_set_last_error("llvm create const failed.");
+        return false;
+    }
+
+    /* call aot_invoke_native() function */
+    if (!(res = LLVMBuildCall(comp_ctx->builder, func,
+                              func_param_values, 4, "res"))) {
+        aot_set_last_error("llvm build call failed.");
+        return false;
+    }
+
+    /* get function return value */
     if (wasm_ret_type != VALUE_TYPE_VOID) {
         if (!(ret_ptr_type = LLVMPointerType(ret_type, 0))) {
             aot_set_last_error("llvm add pointer type failed.");
@@ -227,39 +244,12 @@ call_aot_invoke_native_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
             aot_set_last_error("llvm build bit cast failed.");
             return false;
         }
-
-        /* convert to int32 pointer */
-        if (!(value_ret_ptr = LLVMBuildBitCast(comp_ctx->builder, value_ret,
-                                               INT32_PTR_TYPE, "argv_ret_ptr"))) {
-            aot_set_last_error("llvm build store failed.");
+        if (!(*p_value_ret = LLVMBuildLoad(comp_ctx->builder, value_ret,
+                                           "value_ret"))) {
+            aot_set_last_error("llvm build load failed.");
             return false;
         }
     }
-    else {
-        value_ret_ptr = LLVMConstNull(INT32_PTR_TYPE);
-    }
-
-    func_param_values[0] = func_ctx->exec_env;
-    func_param_values[1] = func_idx;
-    func_param_values[2] = func_ctx->argv_buf;
-    func_param_values[3] = I32_CONST(param_cell_num);
-    func_param_values[4] = value_ret_ptr;
-
-    if (!func_param_values[3]) {
-        aot_set_last_error("llvm create const failed.");
-        return false;
-    }
-
-    /* call aot_invoke_native() function */
-    if (!(res = LLVMBuildCall(comp_ctx->builder, func,
-                              func_param_values, 5, "res"))) {
-        aot_set_last_error("llvm build call failed.");
-        return false;
-    }
-
-    if (wasm_ret_type != VALUE_TYPE_VOID)
-        /* get function return value */
-        *p_value_ret = LLVMBuildLoad(comp_ctx->builder, value_ret, "value_ret");
 
     *p_res = res;
     return true;
@@ -395,10 +385,10 @@ call_aot_call_indirect_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
                             LLVMTypeRef ret_type, uint8 wasm_ret_type,
                             LLVMValueRef *p_value_ret, LLVMValueRef *p_res)
 {
-    LLVMTypeRef func_type, func_ptr_type, func_param_types[7];
+    LLVMTypeRef func_type, func_ptr_type, func_param_types[6];
     LLVMTypeRef ret_ptr_type, elem_ptr_type;
     LLVMValueRef func, elem_idx, elem_ptr;
-    LLVMValueRef func_param_values[7], value_ret = NULL, value_ret_ptr, res = NULL;
+    LLVMValueRef func_param_values[6], value_ret = NULL, res = NULL;
     char buf[32], *func_name = "aot_call_indirect";
     uint32 i, cell_num = 0;
 
@@ -407,10 +397,9 @@ call_aot_call_indirect_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     func_param_types[1] = INT8_TYPE;                /* check_func_type */
     func_param_types[2] = I32_TYPE;                 /* func_type_idx */
     func_param_types[3] = I32_TYPE;                 /* table_elem_idx */
-    func_param_types[4] = INT32_PTR_TYPE;           /* frame_lp */
-    func_param_types[5] = I32_TYPE;                 /* argc */
-    func_param_types[6] = INT32_PTR_TYPE;           /* argv_ret */
-    if (!(func_type = LLVMFunctionType(INT8_TYPE, func_param_types, 7, false))) {
+    func_param_types[4] = I32_TYPE;                 /* argc */
+    func_param_types[5] = INT32_PTR_TYPE;           /* argv */
+    if (!(func_type = LLVMFunctionType(INT8_TYPE, func_param_types, 6, false))) {
         aot_set_last_error("llvm add function type failed.");
         return false;
     }
@@ -470,36 +459,12 @@ call_aot_call_indirect_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         cell_num += wasm_value_type_cell_num(aot_func_type->types[i]);
     }
 
-    if (wasm_ret_type != VALUE_TYPE_VOID) {
-        if (!(ret_ptr_type = LLVMPointerType(ret_type, 0))) {
-            aot_set_last_error("llvm add pointer type failed.");
-            return false;
-        }
-
-        if (!(value_ret = LLVMBuildBitCast(comp_ctx->builder, func_ctx->argv_buf,
-                                           ret_ptr_type, "argv_ret"))) {
-            aot_set_last_error("llvm build bit cast failed.");
-            return false;
-        }
-
-        /* convert to int32 pointer */
-        if (!(value_ret_ptr = LLVMBuildBitCast(comp_ctx->builder, value_ret,
-                                               INT32_PTR_TYPE, "argv_ret_ptr"))) {
-            aot_set_last_error("llvm build store failed.");
-            return false;
-        }
-    }
-    else {
-        value_ret_ptr = LLVMConstNull(INT32_PTR_TYPE);
-    }
-
     func_param_values[0] = func_ctx->exec_env;
     func_param_values[1] = I8_CONST(true);
     func_param_values[2] = func_type_idx;
     func_param_values[3] = table_elem_idx;
-    func_param_values[4] = func_ctx->argv_buf;
-    func_param_values[5] = I32_CONST(param_cell_num);
-    func_param_values[6] = value_ret_ptr;
+    func_param_values[4] = I32_CONST(param_cell_num);
+    func_param_values[5] = func_ctx->argv_buf;
 
     if (!func_param_values[1] || !func_param_values[4]) {
         aot_set_last_error("llvm create const failed.");
@@ -508,14 +473,30 @@ call_aot_call_indirect_func(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 
     /* call aot_call_indirect() function */
     if (!(res = LLVMBuildCall(comp_ctx->builder, func,
-                              func_param_values, 7, "res"))) {
+                              func_param_values, 6, "res"))) {
         aot_set_last_error("llvm build call failed.");
         return false;
     }
 
-    if (wasm_ret_type != VALUE_TYPE_VOID)
-        /* get function return value */
-        *p_value_ret = LLVMBuildLoad(comp_ctx->builder, value_ret, "value_ret");
+    /* get function return value */
+    if (wasm_ret_type != VALUE_TYPE_VOID) {
+        if (!(ret_ptr_type = LLVMPointerType(ret_type, 0))) {
+            aot_set_last_error("llvm add pointer type failed.");
+            return false;
+        }
+
+        if (!(value_ret = LLVMBuildBitCast(comp_ctx->builder, func_ctx->argv_buf,
+                                           ret_ptr_type, "argv_ret"))) {
+            aot_set_last_error("llvm build bit cast failed.");
+            return false;
+        }
+
+        if (!(*p_value_ret = LLVMBuildLoad(comp_ctx->builder, value_ret,
+                                           "value_ret"))) {
+            aot_set_last_error("llvm build load failed.");
+            return false;
+        }
+    }
 
     *p_res = res;
     return true;