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

remove duplicated method resolve_main_func (#305)

Browse Source
This commit is contained in:
dpinthinker 2020-07-10 16:47:22 +08:00 committed by GitHub
parent 0472ddc0d0
commit 49555f48b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1585,40 +1585,8 @@ wasm_exec_env_get_module(WASMExecEnv *exec_env)
*/ */
static WASMFunctionInstanceCommon* static WASMFunctionInstanceCommon*
resolve_main_function(const WASMModuleInstanceCommon *module_inst) resolve_function(const WASMModuleInstanceCommon *module_inst,
{ const char *name);
uint32 i;
#if WASM_ENABLE_INTERP != 0
if (module_inst->module_type == Wasm_Module_Bytecode) {
WASMModuleInstance *wasm_inst = (WASMModuleInstance*)module_inst;
for (i = 0; i < wasm_inst->export_func_count; i++) {
if (!strcmp(wasm_inst->export_functions[i].name, "_main")
|| !strcmp(wasm_inst->export_functions[i].name, "main"))
return (WASMFunctionInstanceCommon*)
wasm_inst->export_functions[i].function;
}
LOG_ERROR("WASM execute application failed: main function not found.\n");
return NULL;
}
#endif
#if WASM_ENABLE_AOT != 0
if (module_inst->module_type == Wasm_Module_AoT) {
AOTModuleInstance *aot_inst = (AOTModuleInstance*)module_inst;
AOTModule *module = (AOTModule*)aot_inst->aot_module.ptr;
for (i = 0; i < module->export_func_count; i++) {
if (!strcmp(module->export_funcs[i].func_name, "_main")
|| !strcmp(module->export_funcs[i].func_name, "main"))
return (WASMFunctionInstanceCommon*)&module->export_funcs[i];
}
LOG_ERROR("WASM execute application failed: main function not found.\n");
return NULL;
}
#endif
return NULL;
}
static bool static bool
check_main_func_type(const WASMType *type) check_main_func_type(const WASMType *type)
@ -1672,7 +1640,11 @@ wasm_application_execute_main(WASMModuleInstanceCommon *module_inst,
} }
#endif /* end of WASM_ENABLE_LIBC_WASI */ #endif /* end of WASM_ENABLE_LIBC_WASI */
func = resolve_main_function(module_inst); func = resolve_function(module_inst, "_main");
if (!func) {
func = resolve_function(module_inst, "main");
}
if (!func) { if (!func) {
wasm_runtime_set_exception(module_inst, wasm_runtime_set_exception(module_inst,
"lookup main function failed."); "lookup main function failed.");