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

Fix drop opcode issue in fast interpreter (#1231)

Browse Source 
Fix fast interpreter issue reported in #1230
This commit is contained in:
Xu Jun 2022-06-16 09:51:01 +08:00 committed by GitHub
parent e0a8aa09be
commit b39f4c5c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6552,6 +6552,16 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
} }
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
/* For the first traverse, the initial value of preserved_local_offset has
* not been determined, we use the INT16_MAX to represent that a slot has
* been copied to preserve space. For second traverse, this field will be
* set to the appropriate value in wasm_loader_ctx_reinit.
* This is for Issue #1230,
* https://github.com/bytecodealliance/wasm-micro-runtime/issues/1230, the
* drop opcodes need to know which slots are preserved, so those slots will
* not be treated as dynamically allocated slots */
loader_ctx->preserved_local_offset = INT16_MAX;
re_scan: re_scan:
if (loader_ctx->code_compiled_size > 0) { if (loader_ctx->code_compiled_size > 0) {
if (!wasm_loader_ctx_reinit(loader_ctx)) { if (!wasm_loader_ctx_reinit(loader_ctx)) {
@ -7209,8 +7219,10 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
loader_ctx->frame_offset--; loader_ctx->frame_offset--;
if (*(loader_ctx->frame_offset) if ((*(loader_ctx->frame_offset)
> loader_ctx->start_dynamic_offset) > loader_ctx->start_dynamic_offset)
&& (*(loader_ctx->frame_offset)
< loader_ctx->max_dynamic_offset))
loader_ctx->dynamic_offset--; loader_ctx->dynamic_offset--;
#endif #endif
} }
@ -7223,8 +7235,10 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
loader_ctx->frame_offset -= 2; loader_ctx->frame_offset -= 2;
if (*(loader_ctx->frame_offset) if ((*(loader_ctx->frame_offset)
> loader_ctx->start_dynamic_offset) > loader_ctx->start_dynamic_offset)
&& (*(loader_ctx->frame_offset)
< loader_ctx->max_dynamic_offset))
loader_ctx->dynamic_offset -= 2; loader_ctx->dynamic_offset -= 2;
#endif #endif
} }

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

@ -4870,6 +4870,16 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
} }
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
/* For the first traverse, the initial value of preserved_local_offset has
* not been determined, we use the INT16_MAX to represent that a slot has
* been copied to preserve space. For second traverse, this field will be
* set to the appropriate value in wasm_loader_ctx_reinit.
* This is for Issue #1230,
* https://github.com/bytecodealliance/wasm-micro-runtime/issues/1230, the
* drop opcodes need to know which slots are preserved, so those slots will
* not be treated as dynamically allocated slots */
loader_ctx->preserved_local_offset = INT16_MAX;
re_scan: re_scan:
if (loader_ctx->code_compiled_size > 0) { if (loader_ctx->code_compiled_size > 0) {
if (!wasm_loader_ctx_reinit(loader_ctx)) { if (!wasm_loader_ctx_reinit(loader_ctx)) {
@ -5446,8 +5456,10 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
loader_ctx->frame_offset--; loader_ctx->frame_offset--;
if (*(loader_ctx->frame_offset) if ((*(loader_ctx->frame_offset)
> loader_ctx->start_dynamic_offset) > loader_ctx->start_dynamic_offset)
&& (*(loader_ctx->frame_offset)
< loader_ctx->max_dynamic_offset))
loader_ctx->dynamic_offset--; loader_ctx->dynamic_offset--;
#endif #endif
} }
@ -5460,9 +5472,11 @@ re_scan:
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
loader_ctx->frame_offset -= 2; loader_ctx->frame_offset -= 2;
if (*(loader_ctx->frame_offset) if ((*(loader_ctx->frame_offset)
> loader_ctx->start_dynamic_offset) > loader_ctx->start_dynamic_offset)
loader_ctx->dynamic_offset -= 2; && (*(loader_ctx->frame_offset)
< loader_ctx->max_dynamic_offset))
loader_ctx->dynamic_offset--;
#endif #endif
} }
else { else {