Skip to content

Commit 986030e

Browse files
committed
refactor(instruction-metering): improve code formatting and readability in interpreter files
1 parent 1809d7a commit 986030e

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

core/iwasm/interpreter/wasm_interp_classic.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7624,7 +7624,8 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
76247624
if ((running_mode == Mode_Interp)
76257625
&& is_instruction_metering_exception(module_inst)) {
76267626
exec_env->metering_suspended = true;
7627-
exec_env->metering_suspend_frame = wasm_exec_env_get_cur_frame(exec_env);
7627+
exec_env->metering_suspend_frame =
7628+
wasm_exec_env_get_cur_frame(exec_env);
76287629
return;
76297630
}
76307631
#endif

core/iwasm/interpreter/wasm_interp_fast.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ typedef float64 CellType_F64;
9292
#if WASM_ENABLE_INSTRUCTION_METERING != 0
9393
#if WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS != 0
9494
#define ROLLBACK_IP_AFTER_METERING_CHECK() \
95-
do { \
96-
frame_ip -= sizeof(void *); \
95+
do { \
96+
frame_ip -= sizeof(void *); \
9797
} while (0)
9898
#else
9999
#define ROLLBACK_IP_AFTER_METERING_CHECK() \
100-
do { \
101-
frame_ip -= sizeof(int32); \
100+
do { \
101+
frame_ip -= sizeof(int32); \
102102
} while (0)
103103
#endif
104104

@@ -7828,11 +7828,11 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
78287828
}
78297829

78307830
#if WASM_ENABLE_INSTRUCTION_METERING != 0
7831-
resume_func:
7831+
resume_func:
78327832
#if WASM_ENABLE_THREAD_MGR != 0
7833-
CHECK_SUSPEND_FLAGS();
7833+
CHECK_SUSPEND_FLAGS();
78347834
#endif
7835-
HANDLE_OP_END();
7835+
HANDLE_OP_END();
78367836
#endif
78377837

78387838
return_func:
@@ -8019,9 +8019,9 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
80198019
frame->lp = frame->operand + 0;
80208020
#if WASM_ENABLE_GC != 0
80218021
frame->frame_ref =
8022-
(uint8 *)(frame->lp + (function->ret_cell_num > 2
8023-
? function->ret_cell_num
8024-
: 2));
8022+
(uint8 *)(frame->lp
8023+
+ (function->ret_cell_num > 2 ? function->ret_cell_num
8024+
: 2));
80258025
#endif
80268026
frame->ret_offset = 0;
80278027

@@ -8066,8 +8066,7 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
80668066
else {
80678067
wasm_interp_call_func_bytecode(module_inst, exec_env, function,
80688068
#if WASM_ENABLE_INSTRUCTION_METERING != 0
8069-
resume_metering ? suspended_frame
8070-
: frame
8069+
resume_metering ? suspended_frame : frame
80718070
#else
80728071
frame
80738072
#endif
@@ -8077,7 +8076,8 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
80778076
#if WASM_ENABLE_INSTRUCTION_METERING != 0
80788077
if (is_instruction_metering_exception(module_inst)) {
80798078
exec_env->metering_suspended = true;
8080-
exec_env->metering_suspend_frame = wasm_exec_env_get_cur_frame(exec_env);
8079+
exec_env->metering_suspend_frame =
8080+
wasm_exec_env_get_cur_frame(exec_env);
80818081
return;
80828082
}
80838083
#endif

0 commit comments

Comments
 (0)