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 fast interp RECOVER_BR_INFO and local set/tee (#3434)

Browse Source 
When copying two cells from src offsets to dst offsets in RECOVER_BR_INFO,
the offsets may be overlapped and the src data may be overwritten, use
GET_I64_FROM_ADDR and then SET_I64_FROM_ADDR instead to resolve it.

And handling VALUE_TYPE_FUNCREF/VALUE_TYPE_EXTERNREF for opcode
local.set and local.tee when reference types feature is enabled.

This PR fixes issue #3401 and #3402.
This commit is contained in:
Wenyong Huang 2024-05-15 15:20:21 +08:00 committed by GitHub
parent 49c9fa31da
commit 7949df96f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/iwasm/interpreter/wasm_interp_fast.c
View File

@ -973,9 +973,9 @@ fail:
} \ } \
} \ } \
else if (cells[0] == 2) { \ else if (cells[0] == 2) { \
frame_lp[dst_offsets[0]] = frame_lp[src_offsets[0]]; \ PUT_I64_TO_ADDR( \
frame_lp[dst_offsets[0] + 1] = \ frame_lp + dst_offsets[0], \
frame_lp[src_offsets[0] + 1]; \ GET_I64_FROM_ADDR(frame_lp + src_offsets[0])); \
/* Ignore constants because they are not reference */ \ /* Ignore constants because they are not reference */ \
if (src_offsets[0] >= 0) { \ if (src_offsets[0] >= 0) { \
CLEAR_FRAME_REF((unsigned)src_offsets[0]); \ CLEAR_FRAME_REF((unsigned)src_offsets[0]); \
@ -1020,9 +1020,9 @@ fail:
if (cells[0] == 1) \ if (cells[0] == 1) \
frame_lp[dst_offsets[0]] = frame_lp[src_offsets[0]]; \ frame_lp[dst_offsets[0]] = frame_lp[src_offsets[0]]; \
else if (cells[0] == 2) { \ else if (cells[0] == 2) { \
frame_lp[dst_offsets[0]] = frame_lp[src_offsets[0]]; \ PUT_I64_TO_ADDR( \
frame_lp[dst_offsets[0] + 1] = \ frame_lp + dst_offsets[0], \
frame_lp[src_offsets[0] + 1]; \ GET_I64_FROM_ADDR(frame_lp + src_offsets[0])); \
} \ } \
} \ } \
else { \ else { \
@ -4868,8 +4868,12 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
GET_LOCAL_INDEX_TYPE_AND_OFFSET(); GET_LOCAL_INDEX_TYPE_AND_OFFSET();
addr1 = GET_OFFSET(); addr1 = GET_OFFSET();
if (local_type == VALUE_TYPE_I32 if (local_type == VALUE_TYPE_I32 || local_type == VALUE_TYPE_F32
|| local_type == VALUE_TYPE_F32) { #if WASM_ENABLE_REF_TYPES != 0 && WASM_ENABLE_GC == 0
|| local_type == VALUE_TYPE_FUNCREF
|| local_type == VALUE_TYPE_EXTERNREF
#endif
) {
*(int32 *)(frame_lp + local_offset) = frame_lp[addr1]; *(int32 *)(frame_lp + local_offset) = frame_lp[addr1];
} }
else if (local_type == VALUE_TYPE_I64 else if (local_type == VALUE_TYPE_I64