Remove some unused codes (#1379)

Remove some unused fields in module instance and the related codes,
which are introduced by emsdk some special mode (-DSIDE_MODULE=1),
and are not required now.

core/iwasm/aot/aot_runtime.h

@@ -373,19 +373,15 @@ typedef struct AOTModuleInstance {
     AOTPointer wasi_ctx;
     /* function performance profiling info list */
     AOTPointer func_perf_profilings;
+    /* stack frames, used in call stack dump and perf profiling */
+    AOTPointer frames;
 
     AOTPointer exec_env_singleton;
 
-    /* others */
-    uint32 temp_ret;
-    uint32 llvm_stack;
     uint32 default_wasm_stack_size;
 
-    uint32 _padding;
-    /* store stacktrace information */
-    AOTPointer frames;
     /* reserved */
-    uint32 reserved[6];
+    uint32 reserved[9];
 
     /*
      * +------------------------------+ <-- memories.ptr

core/iwasm/common/wasm_runtime_common.c

@@ -2314,70 +2314,6 @@ wasm_runtime_get_native_addr_range(WASMModuleInstanceCommon *module_inst,
     return false;
 }
 
-uint32
-wasm_runtime_get_temp_ret(WASMModuleInstanceCommon *module_inst)
-{
-#if WASM_ENABLE_INTERP != 0
-    if (module_inst->module_type == Wasm_Module_Bytecode)
-        return ((WASMModuleInstance *)module_inst)->temp_ret;
-#endif
-#if WASM_ENABLE_AOT != 0
-    if (module_inst->module_type == Wasm_Module_AoT)
-        return ((AOTModuleInstance *)module_inst)->temp_ret;
-#endif
-    return 0;
-}
-
-void
-wasm_runtime_set_temp_ret(WASMModuleInstanceCommon *module_inst,
-                          uint32 temp_ret)
-{
-#if WASM_ENABLE_INTERP != 0
-    if (module_inst->module_type == Wasm_Module_Bytecode) {
-        ((WASMModuleInstance *)module_inst)->temp_ret = temp_ret;
-        return;
-    }
-#endif
-#if WASM_ENABLE_AOT != 0
-    if (module_inst->module_type == Wasm_Module_AoT) {
-        ((AOTModuleInstance *)module_inst)->temp_ret = temp_ret;
-        return;
-    }
-#endif
-}
-
-uint32
-wasm_runtime_get_llvm_stack(WASMModuleInstanceCommon *module_inst)
-{
-#if WASM_ENABLE_INTERP != 0
-    if (module_inst->module_type == Wasm_Module_Bytecode)
-        return ((WASMModuleInstance *)module_inst)->llvm_stack;
-#endif
-#if WASM_ENABLE_AOT != 0
-    if (module_inst->module_type == Wasm_Module_AoT)
-        return ((AOTModuleInstance *)module_inst)->llvm_stack;
-#endif
-    return 0;
-}
-
-void
-wasm_runtime_set_llvm_stack(WASMModuleInstanceCommon *module_inst,
-                            uint32 llvm_stack)
-{
-#if WASM_ENABLE_INTERP != 0
-    if (module_inst->module_type == Wasm_Module_Bytecode) {
-        ((WASMModuleInstance *)module_inst)->llvm_stack = llvm_stack;
-        return;
-    }
-#endif
-#if WASM_ENABLE_AOT != 0
-    if (module_inst->module_type == Wasm_Module_AoT) {
-        ((AOTModuleInstance *)module_inst)->llvm_stack = llvm_stack;
-        return;
-    }
-#endif
-}
-
 bool
 wasm_runtime_enlarge_memory(WASMModuleInstanceCommon *module,
                             uint32 inc_page_count)

core/iwasm/common/wasm_runtime_common.h

@@ -689,20 +689,6 @@ WASM_RUNTIME_API_EXTERN const uint8 *
 wasm_runtime_get_custom_section(WASMModuleCommon *const module_comm,
                                 const char *name, uint32 *len);
 
-uint32
-wasm_runtime_get_temp_ret(WASMModuleInstanceCommon *module_inst);
-
-void
-wasm_runtime_set_temp_ret(WASMModuleInstanceCommon *module_inst,
-                          uint32 temp_ret);
-
-uint32
-wasm_runtime_get_llvm_stack(WASMModuleInstanceCommon *module_inst);
-
-void
-wasm_runtime_set_llvm_stack(WASMModuleInstanceCommon *module_inst,
-                            uint32 llvm_stack);
-
 #if WASM_ENABLE_MULTI_MODULE != 0
 WASM_RUNTIME_API_EXTERN void
 wasm_runtime_set_module_reader(const module_reader reader,

core/iwasm/interpreter/wasm_runtime.h

@@ -218,9 +218,6 @@ struct WASMModuleInstance {
 
     WASMExecEnv *exec_env_singleton;
 
-    uint32 temp_ret;
-    uint32 llvm_stack;
-
     /* Default WASM stack size of threads of this Module instance. */
     uint32 default_wasm_stack_size;
 

core/iwasm/libraries/libc-builtin/libc_builtin_wrapper.c

@@ -16,18 +16,6 @@
 void
 wasm_runtime_set_exception(wasm_module_inst_t module, const char *exception);
 
-uint32
-wasm_runtime_get_temp_ret(wasm_module_inst_t module);
-
-void
-wasm_runtime_set_temp_ret(wasm_module_inst_t module, uint32 temp_ret);
-
-uint32
-wasm_runtime_get_llvm_stack(wasm_module_inst_t module);
-
-void
-wasm_runtime_set_llvm_stack(wasm_module_inst_t module, uint32 llvm_stack);
-
 uint32
 wasm_runtime_module_realloc(wasm_module_inst_t module, uint32 ptr, uint32 size,
                             void **p_native_addr);
@@ -841,87 +829,6 @@ isalnum_wrapper(wasm_exec_env_t exec_env, int32 c)
     return isalnum(c);
 }
 
-static void
-setTempRet0_wrapper(wasm_exec_env_t exec_env, uint32 temp_ret)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    wasm_runtime_set_temp_ret(module_inst, temp_ret);
-}
-
-static uint32
-getTempRet0_wrapper(wasm_exec_env_t exec_env)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    return wasm_runtime_get_temp_ret(module_inst);
-}
-
-static uint32
-llvm_bswap_i16_wrapper(wasm_exec_env_t exec_env, uint32 data)
-{
-    return (data & 0xFFFF0000) | ((data & 0xFF) << 8) | ((data & 0xFF00) >> 8);
-}
-
-static uint32
-llvm_bswap_i32_wrapper(wasm_exec_env_t exec_env, uint32 data)
-{
-    return ((data & 0xFF) << 24) | ((data & 0xFF00) << 8)
-           | ((data & 0xFF0000) >> 8) | ((data & 0xFF000000) >> 24);
-}
-
-static uint32
-bitshift64Lshr_wrapper(wasm_exec_env_t exec_env, uint32 uint64_part0,
-                       uint32 uint64_part1, uint32 bits)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    union {
-        uint64 value;
-        uint32 parts[2];
-    } u;
-
-    u.parts[0] = uint64_part0;
-    u.parts[1] = uint64_part1;
-
-    u.value >>= bits;
-    /* return low 32bit and save high 32bit to temp ret */
-    wasm_runtime_set_temp_ret(module_inst, (uint32)(u.value >> 32));
-    return (uint32)u.value;
-}
-
-static uint32
-bitshift64Shl_wrapper(wasm_exec_env_t exec_env, uint32 int64_part0,
-                      uint32 int64_part1, uint32 bits)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    union {
-        int64 value;
-        uint32 parts[2];
-    } u;
-
-    u.parts[0] = int64_part0;
-    u.parts[1] = int64_part1;
-
-    u.value <<= bits;
-    /* return low 32bit and save high 32bit to temp ret */
-    wasm_runtime_set_temp_ret(module_inst, (uint32)(u.value >> 32));
-    return (uint32)u.value;
-}
-
-static void
-llvm_stackrestore_wrapper(wasm_exec_env_t exec_env, uint32 llvm_stack)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    os_printf("_llvm_stackrestore called!\n");
-    wasm_runtime_set_llvm_stack(module_inst, llvm_stack);
-}
-
-static uint32
-llvm_stacksave_wrapper(wasm_exec_env_t exec_env)
-{
-    wasm_module_inst_t module_inst = get_module_inst(exec_env);
-    os_printf("_llvm_stacksave called!\n");
-    return wasm_runtime_get_llvm_stack(module_inst);
-}
-
 static uint32
 emscripten_memcpy_big_wrapper(wasm_exec_env_t exec_env, void *dst,
                               const void *src, uint32 size)
@@ -1108,14 +1015,6 @@ static NativeSymbol native_symbols_libc_builtin[] = {
     REG_NATIVE_FUNC(tolower, "(i)i"),
     REG_NATIVE_FUNC(toupper, "(i)i"),
     REG_NATIVE_FUNC(isalnum, "(i)i"),
-    REG_NATIVE_FUNC(setTempRet0, "(i)"),
-    REG_NATIVE_FUNC(getTempRet0, "()i"),
-    REG_NATIVE_FUNC(llvm_bswap_i16, "(i)i"),
-    REG_NATIVE_FUNC(llvm_bswap_i32, "(i)i"),
-    REG_NATIVE_FUNC(bitshift64Lshr, "(iii)i"),
-    REG_NATIVE_FUNC(bitshift64Shl, "(iii)i"),
-    REG_NATIVE_FUNC(llvm_stackrestore, "(i)"),
-    REG_NATIVE_FUNC(llvm_stacksave, "()i"),
     REG_NATIVE_FUNC(emscripten_memcpy_big, "(**~)i"),
     REG_NATIVE_FUNC(abort, "(i)"),
     REG_NATIVE_FUNC(abortStackOverflow, "(i)"),