gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-14 05:31:13 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fast-interp: Fix stack recovery for else branch (#3100)

Browse Source 
The issue was reported in #3090.
This commit is contained in:
Xu Jun 2024-01-31 11:23:23 +08:00 committed by GitHub
parent af318bac81
commit 5a99866c01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/iwasm/interpreter/wasm_loader.c
View File

@ -7980,20 +7980,29 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
/* Recover top param_count values of frame_offset stack */ /* Recover top param_count values of frame_offset stack */
if (block->available_param_num) { if (block->available_param_num) {
uint32 size; uint32 available_param_cell_num = 0;
size = sizeof(int16) * block->available_param_num;
bh_memcpy_s(loader_ctx->frame_offset, size, /* total cell num of available parameters */
block->param_frame_offsets, size); for (i = 0; i < block->available_param_num; i++) {
loader_ctx->frame_offset += (size / sizeof(int16)); uint32 cell_num = wasm_value_type_cell_num(
block->block_type.u.type->types[i]);
/* recover dynamic offset */ /* recover dynamic offset */
for (i = 0; i < block->available_param_num; i++) { if (block->param_frame_offsets[available_param_cell_num]
if (block->param_frame_offsets[i]
>= loader_ctx->dynamic_offset) { >= loader_ctx->dynamic_offset) {
loader_ctx->dynamic_offset = loader_ctx->dynamic_offset =
block->param_frame_offsets[i] + 1; block->param_frame_offsets
[available_param_cell_num]
+ cell_num;
} }
available_param_cell_num += cell_num;
} }
bh_memcpy_s(
loader_ctx->frame_offset, available_param_cell_num,
block->param_frame_offsets, available_param_cell_num);
loader_ctx->frame_offset += available_param_cell_num;
} }
#endif #endif

25
core/iwasm/interpreter/wasm_mini_loader.c
View File

@ -5819,20 +5819,29 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
/* Recover top param_count values of frame_offset stack */ /* Recover top param_count values of frame_offset stack */
if (block->available_param_num) { if (block->available_param_num) {
uint32 size; uint32 available_param_cell_num = 0;
size = sizeof(int16) * block->available_param_num;
bh_memcpy_s(loader_ctx->frame_offset, size, /* total cell num of available parameters */
block->param_frame_offsets, size); for (i = 0; i < block->available_param_num; i++) {
loader_ctx->frame_offset += (size / sizeof(int16)); uint32 cell_num = wasm_value_type_cell_num(
block->block_type.u.type->types[i]);
/* recover dynamic offset */ /* recover dynamic offset */
for (i = 0; i < block->available_param_num; i++) { if (block->param_frame_offsets[available_param_cell_num]
if (block->param_frame_offsets[i]
>= loader_ctx->dynamic_offset) { >= loader_ctx->dynamic_offset) {
loader_ctx->dynamic_offset = loader_ctx->dynamic_offset =
block->param_frame_offsets[i] + 1; block->param_frame_offsets
[available_param_cell_num]
+ cell_num;
} }
available_param_cell_num += cell_num;
} }
bh_memcpy_s(
loader_ctx->frame_offset, available_param_cell_num,
block->param_frame_offsets, available_param_cell_num);
loader_ctx->frame_offset += available_param_cell_num;
} }
#endif #endif