christoph/wamr
1
Fork 0
Code Releases Activity

Fix issue of restoring wasm operand stack (#1721)

Browse Source
This commit is contained in:
Xu Jun
2022-11-18 18:51:13 +08:00
committed by GitHub
parent 021130f4a3
commit 032b9aa74b
4 changed files with 9 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/iwasm/interpreter/wasm_runtime.c
View File

@ -2027,6 +2027,8 @@ call_wasm_with_hw_bound_check(WASMModuleInstance *module_inst,
WASMJmpBuf jmpbuf_node = { 0 }, *jmpbuf_node_pop;
uint32 page_size = os_getpagesize();
uint32 guard_page_count = STACK_OVERFLOW_CHECK_GUARD_PAGE_COUNT;
WASMRuntimeFrame *prev_frame = wasm_exec_env_get_cur_frame(exec_env);
uint8 *prev_top = exec_env->wasm_stack.s.top;
#ifdef BH_PLATFORM_WINDOWS
const char *exce;
int result;
@ -2081,13 +2083,18 @@ call_wasm_with_hw_bound_check(WASMModuleInstance *module_inst,
ret = false;
}
if (wasm_get_exception(module_inst)) {
/* Note: can't check wasm_get_exception(module_inst) here, there may be
* exception which is not caught by hardware (e.g. uninitialized elements),
* then the stack-frame is already freed inside wasm_interp_call_wasm */
if (!ret) {
#if WASM_ENABLE_DUMP_CALL_STACK != 0
if (wasm_interp_create_call_stack(exec_env)) {
wasm_interp_dump_call_stack(exec_env, true, NULL, 0);
}
#endif
wasm_interp_restore_wasm_frame(exec_env);
/* Restore operand frames */
wasm_exec_env_set_cur_frame(exec_env, prev_frame);
exec_env->wasm_stack.s.top = prev_top;
}
jmpbuf_node_pop = wasm_exec_env_pop_jmpbuf(exec_env);