gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-11 20:21:11 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix load/load_splat macros

Browse Source
This commit is contained in:
James Marsh 2025-01-22 10:09:54 +00:00 committed by Marcin Kolny
parent 80e6c986f4
commit bd97970828
2 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3604,7 +3604,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
global_addr = get_global_addr(global_data, global);
addr_ret = GET_OFFSET();
PUT_V128_TO_ADDR(frame_lp + addr_ret,
GET_V128_FROM_ADDR((uint32 *)global_addr));
GET_V128_FROM_ADDR((uint32 *)global_addr));
HANDLE_OP_END();
}
#endif
@ -3683,7 +3683,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
global_addr = get_global_addr(global_data, global);
addr1 = GET_OFFSET();
PUT_V128_TO_ADDR((uint32 *)global_addr,
GET_V128_FROM_ADDR(frame_lp + addr1));
GET_V128_FROM_ADDR(frame_lp + addr1));
HANDLE_OP_END();
}
#endif
@ -5843,66 +5843,54 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
PUT_V128_TO_ADDR(frame_lp + addr_ret, LOAD_V128(maddr));
break;
}
#define SIMD_LOAD_OP(op_name, simde_func, element_size, num_elements) \
do { \
uint32 offset, addr; \
offset = read_uint32(frame_ip); \
addr = GET_OPERAND(uint32, I32, 0); \
frame_ip += 2; \
addr_ret = GET_OFFSET(); \
CHECK_MEMORY_OVERFLOW(16); \
\
simde_v128_t simde_result = simde_func(maddr); \
\
V128 result; \
SIMDE_V128_TO_SIMD_V128(simde_result, result); \
\
V128 reversed_result; \
for (int i = 0; i < num_elements; i++) { \
reversed_result.i##element_size##x##num_elements[i] = \
result.i##element_size##x##num_elements[num_elements - 1 - i]; \
} \
PUT_V128_TO_ADDR(frame_lp + addr_ret, reversed_result); \
\
break; \
#define SIMD_LOAD_OP(simde_func, element_size, num_elements) \
do { \
uint32 offset, addr; \
offset = read_uint32(frame_ip); \
addr = GET_OPERAND(uint32, I32, 0); \
frame_ip += 2; \
addr_ret = GET_OFFSET(); \
CHECK_MEMORY_OVERFLOW(4); \
\
simde_v128_t simde_result = simde_func(maddr); \
\
V128 result; \
SIMDE_V128_TO_SIMD_V128(simde_result, result); \
PUT_V128_TO_ADDR(frame_lp + addr_ret, result); \
\
break; \
} while (0)
case SIMD_v128_load8x8_s:
{
SIMD_LOAD_OP(SIMD_v128_load8x8_s,
simde_wasm_i16x8_load8x8, 16, 8);
SIMD_LOAD_OP(simde_wasm_i16x8_load8x8, 16, 8);
break;
}
case SIMD_v128_load8x8_u:
{
SIMD_LOAD_OP(SIMD_v128_load8x8_u,
simde_wasm_u16x8_load8x8, 16, 8);
SIMD_LOAD_OP(simde_wasm_u16x8_load8x8, 16, 8);
break;
}
case SIMD_v128_load16x4_s:
{
SIMD_LOAD_OP(SIMD_v128_load16x4_s,
simde_wasm_i32x4_load16x4, 32, 4);
SIMD_LOAD_OP(simde_wasm_i32x4_load16x4, 32, 4);
break;
}
case SIMD_v128_load16x4_u:
{
SIMD_LOAD_OP(SIMD_v128_load16x4_u,
simde_wasm_u32x4_load16x4, 32, 4);
SIMD_LOAD_OP(simde_wasm_u32x4_load16x4, 32, 4);
break;
}
case SIMD_v128_load32x2_s:
{
SIMD_LOAD_OP(SIMD_v128_load32x2_s,
simde_wasm_i64x2_load32x2, 64, 2);
SIMD_LOAD_OP(simde_wasm_i64x2_load32x2, 64, 2);
break;
}
case SIMD_v128_load32x2_u:
{
SIMD_LOAD_OP(SIMD_v128_load32x2_u,
simde_wasm_u64x2_load32x2, 64, 2);
SIMD_LOAD_OP(simde_wasm_u64x2_load32x2, 64, 2);
break;
}
#define SIMD_LOAD_SPLAT_OP(op_name, simde_func) \
#define SIMD_LOAD_SPLAT_OP(simde_func) \
do { \
uint32 offset, addr; \
offset = read_uint32(frame_ip); \
@ -5921,26 +5909,22 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
case SIMD_v128_load8_splat:
{
SIMD_LOAD_SPLAT_OP(SIMD_v128_load8_splat,
simde_wasm_v128_load8_splat);
SIMD_LOAD_SPLAT_OP(simde_wasm_v128_load8_splat);
break;
}
case SIMD_v128_load16_splat:
{
SIMD_LOAD_SPLAT_OP(SIMD_v128_load16_splat,
simde_wasm_v128_load16_splat);
SIMD_LOAD_SPLAT_OP(simde_wasm_v128_load16_splat);
break;
}
case SIMD_v128_load32_splat:
{
SIMD_LOAD_SPLAT_OP(SIMD_v128_load32_splat,
simde_wasm_v128_load32_splat);
SIMD_LOAD_SPLAT_OP(simde_wasm_v128_load32_splat);
break;
}
case SIMD_v128_load64_splat:
{
SIMD_LOAD_SPLAT_OP(SIMD_v128_load64_splat,
simde_wasm_v128_load64_splat);
SIMD_LOAD_SPLAT_OP(simde_wasm_v128_load64_splat);
break;
}
case SIMD_v128_store:

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

@ -9135,13 +9135,15 @@ preserve_referenced_local(WASMLoaderContext *loader_ctx, uint8 opcode,
loader_ctx->frame_offset_bottom[i] = preserved_offset;
}
if (is_32bit_type(cur_type))
i++;
else if (cur_type == VALUE_TYPE_V128) {
if (cur_type == VALUE_TYPE_V128) {
i += 4;
}
else
else if (is_32bit_type(cur_type)) {
i++;
}
else {
i += 2;
}
}
(void)error_buf;
@ -13310,7 +13312,7 @@ re_scan:
func->has_op_set_global_aux_stack = true;
#endif
}
#else /* else of WASM_ENABLE_FAST_INTERP */
#else /* else of WASM_ENABLE_FAST_INTERP */
if (global_type == VALUE_TYPE_I64
|| global_type == VALUE_TYPE_F64) {
skip_label();