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:
@ -61,7 +61,7 @@ main(int argc, char *argv_main[])
|
||||
wasm_function_inst_t func = NULL;
|
||||
wasm_function_inst_t func2 = NULL;
|
||||
char *native_buffer = NULL;
|
||||
uint32_t wasm_buffer = 0;
|
||||
uint64_t wasm_buffer = 0;
|
||||
|
||||
RuntimeInitArgs init_args;
|
||||
memset(&init_args, 0, sizeof(RuntimeInitArgs));
|
||||
@ -176,7 +176,7 @@ main(int argc, char *argv_main[])
|
||||
ret_val);
|
||||
|
||||
// Next we will pass a buffer to the WASM function
|
||||
uint32 argv2[4];
|
||||
uint32 argv2[5];
|
||||
|
||||
// must allocate buffer from wasm instance memory space (never use pointer
|
||||
// from host runtime)
|
||||
@ -185,8 +185,8 @@ main(int argc, char *argv_main[])
|
||||
|
||||
memcpy(argv2, &ret_val, sizeof(float)); // the first argument
|
||||
argv2[1] = wasm_buffer; // the second argument is the wasm buffer address
|
||||
argv2[2] = 100; // the third argument is the wasm buffer size
|
||||
argv2[3] = 3; // the last argument is the digits after decimal point for
|
||||
argv2[3] = 100; // the third argument is the wasm buffer size
|
||||
argv2[4] = 3; // the last argument is the digits after decimal point for
|
||||
// converting float to string
|
||||
|
||||
if (!(func2 = wasm_runtime_lookup_function(module_inst, "float_to_string",
|
||||
@ -231,7 +231,7 @@ fail:
|
||||
wasm_runtime_destroy_exec_env(exec_env);
|
||||
if (module_inst) {
|
||||
if (wasm_buffer)
|
||||
wasm_runtime_module_free(module_inst, wasm_buffer);
|
||||
wasm_runtime_module_free(module_inst, (uint64)wasm_buffer);
|
||||
wasm_runtime_deinstantiate(module_inst);
|
||||
}
|
||||
if (module)
|
||||
|
||||
@ -30,12 +30,14 @@ test_hello2_wrapper(wasm_exec_env_t exec_env, uint32_t nameaddr,
|
||||
wasm_runtime_free(p);
|
||||
|
||||
wasm_module_inst_t inst = wasm_runtime_get_module_inst(exec_env);
|
||||
if (!wasm_runtime_validate_app_str_addr(inst, nameaddr)
|
||||
|| !wasm_runtime_validate_app_addr(inst, resultaddr, resultlen)) {
|
||||
if (!wasm_runtime_validate_app_str_addr(inst, (uint64_t)nameaddr)
|
||||
|| !wasm_runtime_validate_app_addr(inst, (uint64_t)resultaddr,
|
||||
(uint64_t)resultlen)) {
|
||||
return -1;
|
||||
}
|
||||
const char *name = wasm_runtime_addr_app_to_native(inst, nameaddr);
|
||||
char *result = wasm_runtime_addr_app_to_native(inst, resultaddr);
|
||||
const char *name =
|
||||
wasm_runtime_addr_app_to_native(inst, (uint64_t)nameaddr);
|
||||
char *result = wasm_runtime_addr_app_to_native(inst, (uint64_t)resultaddr);
|
||||
return snprintf(result, resultlen,
|
||||
"Hello, %s. This is %s! Your wasm_module_inst_t is %p.\n",
|
||||
name, __func__, inst);
|
||||
|
||||
Reference in New Issue
Block a user