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

correct endif wasm loader

Browse Source
This commit is contained in:
Maks Litskevich 2025-01-27 16:03:59 +00:00 committed by Marcin Kolny
parent 253d741f77
commit 72535e4e45
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7019,7 +7019,6 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
} }
case SIMD_i32x4_add: case SIMD_i32x4_add:
{ {
SIMD_DOUBLE_OP(simde_wasm_i32x4_add); SIMD_DOUBLE_OP(simde_wasm_i32x4_add);
break; break;
} }

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

@ -13228,10 +13228,10 @@ re_scan:
skip_label(); skip_label();
emit_label(WASM_OP_GET_GLOBAL_128); emit_label(WASM_OP_GET_GLOBAL_128);
} }
#endif
#endif /* end of WASM_ENABLE_SIMDE */ #endif /* end of WASM_ENABLE_SIMDE */
emit_uint32(loader_ctx, global_idx); emit_uint32(loader_ctx, global_idx);
PUSH_OFFSET_TYPE(global_type); PUSH_OFFSET_TYPE(global_type);
#endif /* end of WASM_ENABLE_FAST_INTERP */
break; break;
} }

9
core/iwasm/interpreter/wasm_opcode.h
View File

@ -278,8 +278,7 @@ typedef enum WASMOpcode {
DEBUG_OP_BREAK = 0xdc, /* debug break point */ DEBUG_OP_BREAK = 0xdc, /* debug break point */
#endif #endif
#if (WASM_ENABLE_JIT != 0 \ #if (WASM_ENABLE_JIT != 0 || (WASM_ENABLE_FAST_INTERP != 0)) \
|| (WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMDE != 0)) \
&& WASM_ENABLE_SIMD != 0 && WASM_ENABLE_SIMD != 0
EXT_OP_SET_LOCAL_FAST_V128 = 0xdd, EXT_OP_SET_LOCAL_FAST_V128 = 0xdd,
EXT_OP_TEE_LOCAL_FAST_V128 = 0xde, EXT_OP_TEE_LOCAL_FAST_V128 = 0xde,
@ -791,8 +790,7 @@ typedef enum WASMAtomicEXTOpcode {
#endif #endif
#define SET_GOTO_TABLE_ELEM(opcode) [opcode] = HANDLE_OPCODE(opcode) #define SET_GOTO_TABLE_ELEM(opcode) [opcode] = HANDLE_OPCODE(opcode)
#if (WASM_ENABLE_JIT != 0 \ #if (WASM_ENABLE_JIT != 0 || (WASM_ENABLE_FAST_INTERP != 0)) \
|| (WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMDE != 0)) \
&& WASM_ENABLE_SIMD != 0 && WASM_ENABLE_SIMD != 0
#define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() \ #define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() \
SET_GOTO_TABLE_ELEM(WASM_OP_SIMD_PREFIX), SET_GOTO_TABLE_ELEM(WASM_OP_SIMD_PREFIX),
@ -800,8 +798,7 @@ typedef enum WASMAtomicEXTOpcode {
#define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() #define SET_GOTO_TABLE_SIMD_PREFIX_ELEM()
#endif #endif
#if (WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMDE != 0) \ #if (WASM_ENABLE_FAST_INTERP != 0) && WASM_ENABLE_SIMD != 0
&& WASM_ENABLE_SIMD != 0
#define DEF_EXT_V128_HANDLE() \ #define DEF_EXT_V128_HANDLE() \
SET_GOTO_TABLE_ELEM(EXT_OP_SET_LOCAL_FAST_V128), \ SET_GOTO_TABLE_ELEM(EXT_OP_SET_LOCAL_FAST_V128), \
SET_GOTO_TABLE_ELEM(EXT_OP_TEE_LOCAL_FAST_V128), \ SET_GOTO_TABLE_ELEM(EXT_OP_TEE_LOCAL_FAST_V128), \

5
core/iwasm/libraries/simde/simde.cmake
View File

@ -4,8 +4,11 @@
set (LIB_SIMDE_DIR ${CMAKE_CURRENT_LIST_DIR}) set (LIB_SIMDE_DIR ${CMAKE_CURRENT_LIST_DIR})
if (WAMR_BUILD_TARGET MATCHES "AARCH64.*" OR "ARM.*") if (WAMR_BUILD_TARGET MATCHES "AARCH64.*" OR WAMR_BUILD_TARGET MATCHES "ARM.*")
add_definitions (-DWASM_ENABLE_SIMDE=1) add_definitions (-DWASM_ENABLE_SIMDE=1)
else()
message(WARNING "Disabling SIMD for fast interpreter as the target is not supported")
set(WAMR_BUILD_SIMD 0)
endif() endif()
include_directories(${LIB_SIMDE_DIR} ${LIB_SIMDE_DIR}/simde) include_directories(${LIB_SIMDE_DIR} ${LIB_SIMDE_DIR}/simde)