Fix errors on the "i386-windows-msvc" platform

Author: w4454962

core/iwasm/aot/aot_runtime.c

@@ -3327,8 +3327,25 @@ aot_call_indirect(WASMExecEnv *exec_env, uint32 tbl_idx, uint32 table_elem_idx,
         return true;
     }
     else {
+#if WASM_ENABLE_AOT_STACK_FRAME != 0
+        void *prev_frame = get_top_frame(exec_env);
+        /* Only allocate frame for frame-per-call mode; in the
+           frame-per-function mode the frame is allocated at the
+           beginning of the function. */
+        if (!is_frame_per_function(exec_env)
+            && !aot_alloc_frame(exec_env, table_elem_idx)) {
+            return false;
+        }
+#endif
         ret = invoke_native_internal(exec_env, func_ptr, func_type, signature,
                                      attachment, argv, argc, argv);
+#if WASM_ENABLE_AOT_STACK_FRAME != 0
+        /* Free all frames allocated, note that some frames
+           may be allocated in AOT code and haven't been
+           freed if exception occurred */
+        while (get_top_frame(exec_env) != prev_frame)
+            aot_free_frame(exec_env);
+#endif
         if (!ret)
             goto fail;
 

core/iwasm/aot/arch/aot_reloc_x86_32.c

@@ -30,36 +30,47 @@ void __umoddi3();
 #pragma function(floor)
 #pragma function(ceil)
 
-static int64
+static int64 __stdcall 
 __divdi3(int64 a, int64 b)
 {
     return a / b;
 }
 
-static uint64
+static uint64 __stdcall 
 __udivdi3(uint64 a, uint64 b)
 {
     return a / b;
 }
 
-static int64
+static int64 __stdcall 
 __moddi3(int64 a, int64 b)
 {
     return a % b;
 }
 
-static uint64
+static uint64 __stdcall 
 __umoddi3(uint64 a, uint64 b)
 {
     return a % b;
 }
 #endif
 
-static uint64
+static uint64 __stdcall 
 __aulldiv(uint64 a, uint64 b)
 {
     return a / b;
 }
+static int64 __stdcall 
+__alldiv(int64 a, int64 b)
+{
+    return a / b;
+}
+static int64 __stdcall 
+__allrem(int64 a, int64 b)
+{
+    return a % b;
+}
+
 
 /* clang-format off */
 static SymbolMap target_sym_map[] = {
@@ -69,7 +80,9 @@ static SymbolMap target_sym_map[] = {
     REG_SYM(__udivdi3),
     REG_SYM(__moddi3),
     REG_SYM(__umoddi3),
-    REG_SYM(__aulldiv)
+    REG_SYM(__aulldiv),
+    REG_SYM(__alldiv),
+    REG_SYM(__allrem)
 };
 /* clang-format on */
 

core/iwasm/compilation/aot_emit_aot_file.c

@@ -920,9 +920,14 @@ get_relocations_size(AOTObjectData *obj_data,
         /* ignore the relocations to aot_func_internal#n in text section
            for windows platform since they will be applied in
            aot_emit_text_section */
+
+        const char* name = relocation->symbol_name;
+        if (name && obj_data->target_info.bin_type == AOT_COFF32_BIN_TYPE && *name == '_') {
+            name++;
+        }
         if ((!strcmp(relocation_group->section_name, ".text")
              || !strcmp(relocation_group->section_name, ".ltext"))
-            && !strncmp(relocation->symbol_name, AOT_FUNC_INTERNAL_PREFIX,
+            && !strncmp(name, AOT_FUNC_INTERNAL_PREFIX,
                         strlen(AOT_FUNC_INTERNAL_PREFIX))
             && ((!strncmp(obj_data->comp_ctx->target_arch, "x86_64", 6)
                  /* Windows AOT_COFF64_BIN_TYPE */
@@ -2489,7 +2494,11 @@ aot_emit_text_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
                 relocation_count = relocation_group->relocation_count;
                 for (j = 0; j < relocation_count; j++) {
                     /* relocation to aot_func_internal#n */
-                    if (str_starts_with(relocation->symbol_name,
+                    const char* name = relocation->symbol_name;
+                    if (name && obj_data->target_info.bin_type == AOT_COFF32_BIN_TYPE && *name == '_') {
+                        name++;
+                    }
+                    if (str_starts_with(name,
                                         AOT_FUNC_INTERNAL_PREFIX)
                         && ((obj_data->target_info.bin_type
                                  == 6 /* AOT_COFF64_BIN_TYPE */
@@ -2500,7 +2509,7 @@ aot_emit_text_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
                                 && relocation->relocation_type
                                        == 20 /* IMAGE_REL_I386_REL32 */))) {
                         uint32 func_idx =
-                            atoi(relocation->symbol_name
+                            atoi(name
                                  + strlen(AOT_FUNC_INTERNAL_PREFIX));
                         uint64 text_offset, reloc_offset, reloc_addend;
 
@@ -3695,8 +3704,11 @@ aot_resolve_functions(AOTCompContext *comp_ctx, AOTObjectData *obj_data)
     }
 
     while (!LLVMObjectFileIsSymbolIteratorAtEnd(obj_data->binary, sym_itr)) {
-        if ((name = (char *)LLVMGetSymbolName(sym_itr))
-            && str_starts_with(name, prefix)) {
+        name = (char *)LLVMGetSymbolName(sym_itr);
+        if (name && obj_data->target_info.bin_type == AOT_COFF32_BIN_TYPE && *name == '_') {
+            name++;
+        }
+        if (name && str_starts_with(name, prefix)) {
             /* symbol aot_func#n */
             func_index = (uint32)atoi(name + strlen(prefix));
             if (func_index < obj_data->func_count) {
@@ -3734,8 +3746,7 @@ aot_resolve_functions(AOTCompContext *comp_ctx, AOTObjectData *obj_data)
                 }
             }
         }
-        else if ((name = (char *)LLVMGetSymbolName(sym_itr))
-                 && str_starts_with(name, AOT_FUNC_INTERNAL_PREFIX)) {
+        else if (name && str_starts_with(name, AOT_FUNC_INTERNAL_PREFIX)) {
             /* symbol aot_func_internal#n */
             func_index = (uint32)atoi(name + strlen(AOT_FUNC_INTERNAL_PREFIX));
             if (func_index < obj_data->func_count) {