Rebase newest wamr

Author: zhanheng1

core/iwasm/aot/aot_loader.c

@@ -2558,9 +2558,19 @@ load_function_section(const uint8 *buf, const uint8 *buf_end, AOTModule *module,
         }
     }
 
+#if defined(BUILD_TARGET_XTENSA)
+    /*
+     * For Xtensa XIP, real func_count is doubled, including aot_func and
+     * aot_func_internal, so need to divide func_count by 2 here.
+     */
+    if (module->is_indirect_mode)
+        size = sizeof(uint32) * (uint64)module->func_count / 2;
+    else
+#else
     size = sizeof(uint32) * (uint64)module->func_count;
+#endif
 
-    if (size > 0) {
+        if (size > 0) {
 #if WASM_ENABLE_AOT_STACK_FRAME != 0
         if (!(module->max_local_cell_nums =
                   loader_malloc(size, error_buf, error_buf_size))) {

core/iwasm/compilation/aot_emit_aot_file.c

@@ -179,6 +179,16 @@ is_little_endian_binary(const AOTObjectData *obj_data)
     return obj_data->target_info.bin_type & 1 ? false : true;
 }
 
+static bool
+need_call_wrapped_indirect(const AOTObjectData *obj_data)
+{
+    const bool need_precheck = obj_data->comp_ctx->enable_stack_bound_check
+                               || obj_data->comp_ctx->enable_stack_estimation;
+
+    return obj_data->comp_ctx->is_indirect_mode && need_precheck
+           && !strncmp(obj_data->comp_ctx->target_arch, "xtensa", 6);
+}
+
 static bool
 str_starts_with(const char *str, const char *prefix)
 {
@@ -870,11 +880,8 @@ get_func_section_size(AOTCompContext *comp_ctx, AOTCompData *comp_data,
     /* function type indexes */
     size += (uint32)sizeof(uint32) * comp_data->func_count;
 
-    const bool need_precheck = obj_data->comp_ctx->enable_stack_bound_check
-                               || obj_data->comp_ctx->enable_stack_estimation;
     /* aot_func#xxx + aot_func_internal#xxx in XIP mode for xtensa */
-    if (obj_data->comp_ctx->is_indirect_mode && need_precheck
-        && !strncmp(obj_data->comp_ctx->target_arch, "xtensa", 6))
+    if (need_call_wrapped_indirect(obj_data))
         size *= 2;
 
     /* max_local_cell_nums */
@@ -2416,10 +2423,7 @@ aot_emit_init_data_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
         return false;
 
     offset = align_uint(offset, 4);
-    const bool need_precheck = obj_data->comp_ctx->enable_stack_bound_check
-                               || obj_data->comp_ctx->enable_stack_estimation;
-    if (obj_data->comp_ctx->is_indirect_mode && need_precheck
-        && !strncmp(obj_data->comp_ctx->target_arch, "xtensa", 6))
+    if (need_call_wrapped_indirect(obj_data))
         EMIT_U32(comp_data->func_count * 2);
     else
         EMIT_U32(comp_data->func_count);
@@ -2607,10 +2611,7 @@ aot_emit_func_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
             EMIT_U64(func->text_offset);
     }
 
-    const bool need_precheck = obj_data->comp_ctx->enable_stack_bound_check
-                               || obj_data->comp_ctx->enable_stack_estimation;
-    if (obj_data->comp_ctx->is_indirect_mode && need_precheck
-        && !strncmp(obj_data->comp_ctx->target_arch, "xtensa", 6)) {
+    if (need_call_wrapped_indirect(obj_data)) {
         /*
          * Explicitly emit aot_func_internal#xxx for Xtensa XIP, therefore,
          * for aot_func#xxx, func_indexes ranged from 0 ~ func_count,
@@ -2628,8 +2629,7 @@ aot_emit_func_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
     for (i = 0; i < comp_data->func_count; i++)
         EMIT_U32(funcs[i]->func_type_index);
 
-    if (obj_data->comp_ctx->is_indirect_mode && need_precheck
-        && !strncmp(obj_data->comp_ctx->target_arch, "xtensa", 6)) {
+    if (need_call_wrapped_indirect(obj_data)) {
         /* func_type_index for aot_func_internal#xxxx */
         for (i = 0; i < comp_data->func_count; i++)
             EMIT_U32(funcs[i]->func_type_index);