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

fix: formatting

Browse Source
This commit is contained in:
Alix ANNERAUD 2025-03-02 19:48:06 +01:00
parent ca78c6644e
commit 8c262ba005
5 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.h
View File

@ -710,7 +710,7 @@
#define WASM_ENABLE_AOT_VALIDATOR 0 #define WASM_ENABLE_AOT_VALIDATOR 0
#endif #endif
#ifndef WASM_INSTRUCTION_METERING #ifndef WASM_INSTRUCTION_METERING
#define WASM_INSTRUCTION_METERING 1 #define WASM_INSTRUCTION_METERING 1
#endif #endif

5
core/iwasm/common/wasm_runtime_common.c
View File

@ -2286,8 +2286,9 @@ wasm_runtime_access_exce_check_guard_page()
#endif #endif
#ifdef WASM_INSTRUCTION_METERING #ifdef WASM_INSTRUCTION_METERING
void wasm_runtime_set_instructions_to_execute(WASMExecEnv *exec_env, void
int instructions_to_execute) wasm_runtime_set_instructions_to_execute(WASMExecEnv *exec_env,
int instructions_to_execute)
{ {
exec_env->instructions_to_execute = instructions_to_execute; exec_env->instructions_to_execute = instructions_to_execute;
} }

5
core/iwasm/include/wasm_export.h
View File

@ -1827,14 +1827,13 @@ wasm_runtime_set_native_stack_boundary(wasm_exec_env_t exec_env,
* However, if the instruction count limit is set to a positive value, * However, if the instruction count limit is set to a positive value,
* the execution will be terminated when the instruction count reaches * the execution will be terminated when the instruction count reaches
* the limit. * the limit.
* *
* @param exec_env the execution environment * @param exec_env the execution environment
* @param instruction_count the instruction count limit * @param instruction_count the instruction count limit
*/ */
WASM_RUNTIME_API_EXTERN void WASM_RUNTIME_API_EXTERN void
wasm_runtime_set_instruction_count_limit(wasm_exec_env_t exec_env, wasm_runtime_set_instruction_count_limit(wasm_exec_env_t exec_env,
int instruction_count); int instruction_count);
/** /**
* Dump runtime memory consumption, including: * Dump runtime memory consumption, including:

42
core/iwasm/interpreter/wasm_interp_classic.c
View File

@ -1516,13 +1516,13 @@ wasm_interp_call_func_import(WASMModuleInstance *module_inst,
} \ } \
os_mutex_unlock(&exec_env->wait_lock); \ os_mutex_unlock(&exec_env->wait_lock); \
} \ } \
CHECK_INSTRUCTION_LIMIT(); \ \ CHECK_INSTRUCTION_LIMIT(); \
goto *handle_table[*frame_ip++]; \ \ goto *handle_table[*frame_ip++]; \
} while (0) } while (0)
#else #else
#define HANDLE_OP_END() \ #define HANDLE_OP_END() \
CHECK_INSTRUCTION_LIMIT(); \ CHECK_INSTRUCTION_LIMIT(); \
FETCH_OPCODE_AND_DISPATCH() FETCH_OPCODE_AND_DISPATCH()
#endif #endif
#else /* else of WASM_ENABLE_LABELS_AS_VALUES */ #else /* else of WASM_ENABLE_LABELS_AS_VALUES */
@ -1545,12 +1545,12 @@ wasm_interp_call_func_import(WASMModuleInstance *module_inst,
} \ } \
os_mutex_unlock(&exec_env->wait_lock); \ os_mutex_unlock(&exec_env->wait_lock); \
} \ } \
CHECK_INSTRUCTION_LIMIT(); \ CHECK_INSTRUCTION_LIMIT(); \
continue; continue;
#else #else
#define HANDLE_OP_END() #define HANDLE_OP_END()
CHECK_INSTRUCTION_LIMIT(); \ CHECK_INSTRUCTION_LIMIT();
continue; continue;
#endif #endif
#endif /* end of WASM_ENABLE_LABELS_AS_VALUES */ #endif /* end of WASM_ENABLE_LABELS_AS_VALUES */
@ -1569,11 +1569,11 @@ get_global_addr(uint8 *global_data, WASMGlobalInstance *global)
} }
#if WASM_INSTRUCTION_METERING != 0 #if WASM_INSTRUCTION_METERING != 0
#define CHECK_INSTRUCTION_LIMIT() \ #define CHECK_INSTRUCTION_LIMIT() \
if (instructions_left == 0) { \ if (instructions_left == 0) { \
goto return_func; \ goto return_func; \
} \ } \
instructions_left--; instructions_left--;
#else #else
#define CHECK_INSTRUCTION_LIMIT() (void)0 #define CHECK_INSTRUCTION_LIMIT() (void)0
#endif #endif
@ -1621,7 +1621,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
uint32 local_idx, local_offset, global_idx; uint32 local_idx, local_offset, global_idx;
uint8 local_type, *global_addr; uint8 local_type, *global_addr;
uint32 cache_index, type_index, param_cell_num, cell_num; uint32 cache_index, type_index, param_cell_num, cell_num;
#if WASM_INSTRUCTION_METERING != 0 #if WASM_INSTRUCTION_METERING != 0
int instructions_left = exec_env->instructions_to_execute; int instructions_left = exec_env->instructions_to_execute;
#endif #endif
@ -1718,7 +1718,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
goto got_exception; goto got_exception;
} }
HANDLE_OP(WASM_OP_NOP) { HANDLE_OP_END(); } HANDLE_OP(WASM_OP_NOP)
{
HANDLE_OP_END();
}
#if WASM_ENABLE_EXCE_HANDLING != 0 #if WASM_ENABLE_EXCE_HANDLING != 0
HANDLE_OP(WASM_OP_RETHROW) HANDLE_OP(WASM_OP_RETHROW)
@ -2455,7 +2458,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
else else
cur_func_type = cur_func->u.func->func_type; cur_func_type = cur_func->u.func->func_type;
/* clang-format off */ /* clang-format off */
#if WASM_ENABLE_GC == 0 #if WASM_ENABLE_GC == 0
if (cur_type != cur_func_type) { if (cur_type != cur_func_type) {
wasm_set_exception(module, "indirect call type mismatch"); wasm_set_exception(module, "indirect call type mismatch");
@ -5655,7 +5658,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
HANDLE_OP(WASM_OP_I32_REINTERPRET_F32) HANDLE_OP(WASM_OP_I32_REINTERPRET_F32)
HANDLE_OP(WASM_OP_I64_REINTERPRET_F64) HANDLE_OP(WASM_OP_I64_REINTERPRET_F64)
HANDLE_OP(WASM_OP_F32_REINTERPRET_I32) HANDLE_OP(WASM_OP_F32_REINTERPRET_I32)
HANDLE_OP(WASM_OP_F64_REINTERPRET_I64) { HANDLE_OP_END(); } HANDLE_OP(WASM_OP_F64_REINTERPRET_I64)
{
HANDLE_OP_END();
}
HANDLE_OP(WASM_OP_I32_EXTEND8_S) HANDLE_OP(WASM_OP_I32_EXTEND8_S)
{ {

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

@ -102,11 +102,11 @@ typedef float64 CellType_F64;
} while (0) } while (0)
#if WASM_INSTRUCTION_METERING != 0 #if WASM_INSTRUCTION_METERING != 0
#define CHECK_INSTRUCTION_LIMIT() \ #define CHECK_INSTRUCTION_LIMIT() \
if (instructions_left == 0) { \ if (instructions_left == 0) { \
goto return_func; \ goto return_func; \
} \ } \
instructions_left--; instructions_left--;
#else #else
#define CHECK_INSTRUCTION_LIMIT() (void)0 #define CHECK_INSTRUCTION_LIMIT() (void)0
#endif #endif