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:
@ -1004,17 +1004,23 @@ create_aux_stack_info(const AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
|
||||
|
||||
if (!(aux_stack_bound_addr =
|
||||
LLVMBuildBitCast(comp_ctx->builder, aux_stack_bound_addr,
|
||||
INT32_PTR_TYPE, "aux_stack_bound_ptr"))) {
|
||||
INTPTR_T_PTR_TYPE, "aux_stack_bound_ptr"))) {
|
||||
aot_set_last_error("llvm build bit cast failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!(func_ctx->aux_stack_bound =
|
||||
LLVMBuildLoad2(comp_ctx->builder, I32_TYPE, aux_stack_bound_addr,
|
||||
"aux_stack_bound"))) {
|
||||
LLVMBuildLoad2(comp_ctx->builder, INTPTR_T_TYPE,
|
||||
aux_stack_bound_addr, "aux_stack_bound_intptr"))) {
|
||||
aot_set_last_error("llvm build load failed");
|
||||
return false;
|
||||
}
|
||||
if (!(func_ctx->aux_stack_bound =
|
||||
LLVMBuildZExt(comp_ctx->builder, func_ctx->aux_stack_bound,
|
||||
I64_TYPE, "aux_stack_bound_i64"))) {
|
||||
aot_set_last_error("llvm build truncOrBitCast failed.");
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Get aux stack bottom address */
|
||||
if (!(aux_stack_bottom_addr = LLVMBuildInBoundsGEP2(
|
||||
@ -1026,16 +1032,23 @@ create_aux_stack_info(const AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
|
||||
|
||||
if (!(aux_stack_bottom_addr =
|
||||
LLVMBuildBitCast(comp_ctx->builder, aux_stack_bottom_addr,
|
||||
INT32_PTR_TYPE, "aux_stack_bottom_ptr"))) {
|
||||
INTPTR_T_PTR_TYPE, "aux_stack_bottom_ptr"))) {
|
||||
aot_set_last_error("llvm build bit cast failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!(func_ctx->aux_stack_bottom =
|
||||
LLVMBuildLoad2(comp_ctx->builder, I32_TYPE, aux_stack_bottom_addr,
|
||||
"aux_stack_bottom"))) {
|
||||
LLVMBuildLoad2(comp_ctx->builder, INTPTR_T_TYPE,
|
||||
aux_stack_bottom_addr, "aux_stack_bottom"))) {
|
||||
aot_set_last_error("llvm build load failed");
|
||||
return false;
|
||||
}
|
||||
if (!(func_ctx->aux_stack_bottom =
|
||||
LLVMBuildZExt(comp_ctx->builder, func_ctx->aux_stack_bottom,
|
||||
I64_TYPE, "aux_stack_bottom_i64"))) {
|
||||
aot_set_last_error("llvm build truncOrBitCast failed.");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -1365,7 +1378,7 @@ create_memory_info(const AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
|
||||
}
|
||||
if (!(func_ctx->mem_info[0].mem_data_size_addr = LLVMBuildBitCast(
|
||||
comp_ctx->builder, func_ctx->mem_info[0].mem_data_size_addr,
|
||||
INT32_PTR_TYPE, "mem_data_size_ptr"))) {
|
||||
INT64_PTR_TYPE, "mem_data_size_ptr"))) {
|
||||
aot_set_last_error("llvm build bit cast failed");
|
||||
return false;
|
||||
}
|
||||
@ -1384,7 +1397,7 @@ create_memory_info(const AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
|
||||
return false;
|
||||
}
|
||||
if (!(func_ctx->mem_info[0].mem_data_size_addr = LLVMBuildLoad2(
|
||||
comp_ctx->builder, I32_TYPE,
|
||||
comp_ctx->builder, I64_TYPE,
|
||||
func_ctx->mem_info[0].mem_data_size_addr, "mem_data_size"))) {
|
||||
aot_set_last_error("llvm build load failed");
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user