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:
@ -211,9 +211,9 @@ There are two runtime APIs available for this purpose.
|
||||
* p_native_addr: return the native address of allocated memory
|
||||
* size: the buffer size to allocate
|
||||
*/
|
||||
uint32_t
|
||||
uint64_t
|
||||
wasm_runtime_module_malloc(wasm_module_inst_t module_inst,
|
||||
uint32_t size, void **p_native_addr);
|
||||
uint64_t size, void **p_native_addr);
|
||||
|
||||
/**
|
||||
* malloc a buffer from instance's private memory space,
|
||||
@ -223,28 +223,28 @@ wasm_runtime_module_malloc(wasm_module_inst_t module_inst,
|
||||
* src: the native buffer address
|
||||
* size: the size of buffer to be allocated and copy data
|
||||
*/
|
||||
uint32_t
|
||||
uint64_t
|
||||
wasm_runtime_module_dup_data(wasm_module_inst_t module_inst,
|
||||
const char *src, uint32_t size);
|
||||
const char *src, uint64_t size);
|
||||
|
||||
/* free the memory allocated from module memory space */
|
||||
void
|
||||
wasm_runtime_module_free(wasm_module_inst_t module_inst, uint32_t ptr);
|
||||
wasm_runtime_module_free(wasm_module_inst_t module_inst, uint64_t ptr);
|
||||
```
|
||||
|
||||
Usage sample:
|
||||
|
||||
```c
|
||||
char * buffer = NULL;
|
||||
uint32_t buffer_for_wasm;
|
||||
uint64_t buffer_for_wasm;
|
||||
|
||||
buffer_for_wasm = wasm_runtime_module_malloc(module_inst, 100, &buffer);
|
||||
if (buffer_for_wasm != 0) {
|
||||
uint32 argv[2];
|
||||
uint32 argv[3];
|
||||
strncpy(buffer, "hello", 100); /* use native address for accessing in runtime */
|
||||
argv[0] = buffer_for_wasm; /* pass the buffer address for WASM space */
|
||||
argv[1] = 100; /* the size of buffer */
|
||||
wasm_runtime_call_wasm(exec_env, func, 2, argv);
|
||||
argv[2] = 100; /* the size of buffer */
|
||||
wasm_runtime_call_wasm(exec_env, func, 3, argv);
|
||||
|
||||
/* it is runtime embedder's responsibility to release the memory,
|
||||
unless the WASM app will free the passed pointer in its code */
|
||||
|
||||
Reference in New Issue
Block a user