@@ -75,11 +75,6 @@ bh_static_assert(offsetof(AOTFrame, sp) == sizeof(uintptr_t) * 5);
75
75
bh_static_assert (offsetof(AOTFrame , frame_ref ) == sizeof (uintptr_t ) * 6 );
76
76
bh_static_assert (offsetof(AOTFrame , lp ) == sizeof (uintptr_t ) * 7 );
77
77
78
- bh_static_assert (offsetof(AOTFrame , ip_offset ) == sizeof (uintptr_t ) * 4 );
79
- bh_static_assert (offsetof(AOTFrame , sp ) == sizeof (uintptr_t ) * 5 );
80
- bh_static_assert (offsetof(AOTFrame , frame_ref ) == sizeof (uintptr_t ) * 6 );
81
- bh_static_assert (offsetof(AOTFrame , lp ) == sizeof (uintptr_t ) * 7 );
82
-
83
78
static void
84
79
set_error_buf (char * error_buf , uint32 error_buf_size , const char * string )
85
80
{
@@ -1056,7 +1051,7 @@ memories_instantiate(AOTModuleInstance *module_inst, AOTModuleInstance *parent,
1056
1051
#if WASM_ENABLE_SHARED_MEMORY != 0
1057
1052
/* Currently we have only one memory instance */
1058
1053
bool is_shared_memory =
1059
- module -> memories [0 ].memory_flags & 0x02 ? true : false;
1054
+ module -> memories [0 ].memory_flags & SHARED_MEMORY_FLAG ? true : false;
1060
1055
if (is_shared_memory && parent != NULL ) {
1061
1056
/* Ignore setting memory init data if the memory has been initialized */
1062
1057
return true;
@@ -3680,7 +3675,7 @@ aot_alloc_frame(WASMExecEnv *exec_env, uint32 func_index)
3680
3675
exec_env , exec_env -> restore_call_chain , exec_env -> handle );
3681
3676
if (((AOTFrame * )exec_env -> cur_frame )-> func_index != func_index ) {
3682
3677
LOG_DEBUG ("NOT MATCH!!!\n" );
3683
- exit ( 1 );
3678
+ bh_assert ((( AOTFrame * ) exec_env -> cur_frame ) -> func_index == func_index );
3684
3679
}
3685
3680
return true;
3686
3681
}
@@ -3717,10 +3712,6 @@ aot_alloc_frame(WASMExecEnv *exec_env, uint32 func_index)
3717
3712
frame -> func_perf_prof_info = func_perf_prof ;
3718
3713
#endif
3719
3714
frame -> ip_offset = 0 ;
3720
- frame -> sp = frame -> lp + max_local_cell_num ;
3721
- #if WASM_ENABLE_GC != 0
3722
- frame -> frame_ref = frame -> sp + max_stack_cell_num ;
3723
- #endif
3724
3715
3725
3716
#if WASM_ENABLE_GC != 0
3726
3717
frame -> sp = frame -> lp + max_local_cell_num ;
0 commit comments