Refactor APIs and data structures as preliminary work for Memory64 (#3209)
# Change the data type representing linear memory address from u32 to u64
## APIs signature changes
- (Export)wasm_runtime_module_malloc
- wasm_module_malloc
- wasm_module_malloc_internal
- aot_module_malloc
- aot_module_malloc_internal
- wasm_runtime_module_realloc
- wasm_module_realloc
- wasm_module_realloc_internal
- aot_module_realloc
- aot_module_realloc_internal
- (Export)wasm_runtime_module_free
- wasm_module_free
- wasm_module_free_internal
- aot_module_malloc
- aot_module_free_internal
- (Export)wasm_runtime_module_dup_data
- wasm_module_dup_data
- aot_module_dup_data
- (Export)wasm_runtime_validate_app_addr
- (Export)wasm_runtime_validate_app_str_addr
- (Export)wasm_runtime_validate_native_addr
- (Export)wasm_runtime_addr_app_to_native
- (Export)wasm_runtime_addr_native_to_app
- (Export)wasm_runtime_get_app_addr_range
- aot_set_aux_stack
- aot_get_aux_stack
- wasm_set_aux_stack
- wasm_get_aux_stack
- aot_check_app_addr_and_convert, wasm_check_app_addr_and_convert
and jit_check_app_addr_and_convert
- wasm_exec_env_set_aux_stack
- wasm_exec_env_get_aux_stack
- wasm_cluster_create_thread
- wasm_cluster_allocate_aux_stack
- wasm_cluster_free_aux_stack
## Data structure changes
- WASMModule and AOTModule
- field aux_data_end, aux_heap_base and aux_stack_bottom
- WASMExecEnv
- field aux_stack_boundary and aux_stack_bottom
- AOTCompData
- field aux_data_end, aux_heap_base and aux_stack_bottom
- WASMMemoryInstance(AOTMemoryInstance)
- field memory_data_size and change __padding to is_memory64
- WASMModuleInstMemConsumption
- field total_size and memories_size
- WASMDebugExecutionMemory
- field start_offset and current_pos
- WASMCluster
- field stack_tops
## Components that are affected by the APIs and data structure changes
- libc-builtin
- libc-emcc
- libc-uvwasi
- libc-wasi
- Python and Go Language Embedding
- Interpreter Debug engine
- Multi-thread: lib-pthread, wasi-threads and thread manager
This commit is contained in:
@ -194,12 +194,15 @@ JitReg
|
||||
get_aux_stack_bound_reg(JitFrame *frame)
|
||||
{
|
||||
JitCompContext *cc = frame->cc;
|
||||
JitReg tmp = jit_cc_new_reg_I32(cc);
|
||||
|
||||
if (!frame->aux_stack_bound_reg) {
|
||||
frame->aux_stack_bound_reg = cc->aux_stack_bound_reg;
|
||||
GEN_INSN(
|
||||
LDI32, frame->aux_stack_bound_reg, cc->exec_env_reg,
|
||||
NEW_CONST(I32, offsetof(WASMExecEnv, aux_stack_boundary.boundary)));
|
||||
GEN_INSN(LDPTR, frame->aux_stack_bound_reg, cc->exec_env_reg,
|
||||
NEW_CONST(I32, offsetof(WASMExecEnv, aux_stack_boundary)));
|
||||
/* TODO: Memory64 whether to convert depends on memory idx type */
|
||||
GEN_INSN(I64TOI32, tmp, frame->aux_stack_bound_reg);
|
||||
frame->aux_stack_bound_reg = tmp;
|
||||
}
|
||||
return frame->aux_stack_bound_reg;
|
||||
}
|
||||
@ -208,12 +211,15 @@ JitReg
|
||||
get_aux_stack_bottom_reg(JitFrame *frame)
|
||||
{
|
||||
JitCompContext *cc = frame->cc;
|
||||
JitReg tmp = jit_cc_new_reg_I32(cc);
|
||||
|
||||
if (!frame->aux_stack_bottom_reg) {
|
||||
frame->aux_stack_bottom_reg = cc->aux_stack_bottom_reg;
|
||||
GEN_INSN(
|
||||
LDI32, frame->aux_stack_bottom_reg, cc->exec_env_reg,
|
||||
NEW_CONST(I32, offsetof(WASMExecEnv, aux_stack_bottom.bottom)));
|
||||
GEN_INSN(LDPTR, frame->aux_stack_bottom_reg, cc->exec_env_reg,
|
||||
NEW_CONST(I32, offsetof(WASMExecEnv, aux_stack_bottom)));
|
||||
/* TODO: Memory64 whether to convert depends on memory idx type */
|
||||
GEN_INSN(I64TOI32, tmp, frame->aux_stack_bottom_reg);
|
||||
frame->aux_stack_bottom_reg = tmp;
|
||||
}
|
||||
return frame->aux_stack_bottom_reg;
|
||||
}
|
||||
@ -915,8 +921,8 @@ create_fixed_virtual_regs(JitCompContext *cc)
|
||||
cc->import_func_ptrs_reg = jit_cc_new_reg_ptr(cc);
|
||||
cc->fast_jit_func_ptrs_reg = jit_cc_new_reg_ptr(cc);
|
||||
cc->func_type_indexes_reg = jit_cc_new_reg_ptr(cc);
|
||||
cc->aux_stack_bound_reg = jit_cc_new_reg_I32(cc);
|
||||
cc->aux_stack_bottom_reg = jit_cc_new_reg_I32(cc);
|
||||
cc->aux_stack_bound_reg = jit_cc_new_reg_ptr(cc);
|
||||
cc->aux_stack_bottom_reg = jit_cc_new_reg_ptr(cc);
|
||||
|
||||
count = module->import_memory_count + module->memory_count;
|
||||
if (count > 0) {
|
||||
|
||||
Reference in New Issue
Block a user