Enable AoT and wamr-sdk, and change arguments of call wasm API (#157)
* Implement memory profiler, optimize memory usage, modify code indent * Implement memory.grow and limit heap space base offset to 1G; modify iwasm build type to Release and 64 bit by default * Add a new extension library: connection * Fix bug of reading magic number and version in big endian platform * Re-org platform APIs: move most platform APIs from iwasm to shared-lib * Enhance wasm loader to fix some security issues * Fix issue about illegal load of EXC_RETURN into PC on stm32 board * Updates that let a restricted version of the interpreter run in SGX * Enable native/app address validation and conversion for wasm app * Remove wasm_application_exectue_* APIs from wasm_export.h which makes confused * Refine binary size and fix several minor issues Optimize interpreter LOAD/STORE opcodes to decrease the binary size Fix issues when using iwasm library: _bh_log undefined, bh_memory.h not found Remove unused _stdin/_stdout/_stderr global variables resolve in libc wrapper Add macros of global heap size, stack size, heap size for Zephyr main.c Clear compile warning of wasm_application.c * Add more strict security checks for libc wrapper API's * Use one libc wrapper copy for sgx and other platforms; remove bh_printf macro for other platform header files * Enhance security of libc strcpy/sprintf wrapper function * Fix issue of call native for x86_64/arm/mips, add module inst parameter for native wrapper functions * Remove get_module_inst() and fix issue of call native * Refine wgl lib: remove module_inst parameter from widget functions; move function index check to runtime instantiate * Refine interpreter call native process, refine memory boudary check * Fix issues of invokeNative function of arm/mips/general version * Add a switch to build simple sample without gui support * Add BUILD_TARGET setting in makefile to replace cpu compiler flags in source code * Re-org shared lib header files, remove unused info; fix compile issues of vxworks * Add build target general * Remove unused files * Update license header * test push * Restore file * Sync up with internal/feature * Sync up with internal/feature * Rename build_wamr_app to build_wasm_app * Fix small issues of README * Enhance malformed wasm file checking Fix issue of print hex int and implement utf8 string check Fix wasi file read/write right issue Fix minor issue of build wasm app doc * Sync up with internal/feature * Sync up with internal/feature: fix interpreter arm issue, fix read leb issue * Sync up with internal/feature * Fix bug of config.h and rename wasi config.h to ssp_config.h * Sync up with internal/feature * Import wamr aot * update document * update document * Update document, disable WASI in 32bit * update document * remove files * update document * Update document * update document * update document * update samples * Sync up with internal repo
This commit is contained in:
wenyongh
125
core/shared/mem-alloc/mem_alloc.c
Normal file
125
core/shared/mem-alloc/mem_alloc.c
Normal file
@ -0,0 +1,125 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
*/
|
||||
|
||||
#include "mem_alloc.h"
|
||||
#include "config.h"
|
||||
|
||||
#if DEFAULT_MEM_ALLOCATOR == MEM_ALLOCATOR_EMS
|
||||
|
||||
#include "ems/ems_gc.h"
|
||||
|
||||
mem_allocator_t mem_allocator_create(void *mem, uint32_t size)
|
||||
{
|
||||
return gc_init_with_pool((char *) mem, size);
|
||||
}
|
||||
|
||||
void mem_allocator_destroy(mem_allocator_t allocator)
|
||||
{
|
||||
gc_destroy_with_pool((gc_handle_t) allocator);
|
||||
}
|
||||
|
||||
void *
|
||||
mem_allocator_malloc(mem_allocator_t allocator, uint32_t size)
|
||||
{
|
||||
return gc_alloc_vo_h((gc_handle_t) allocator, size);
|
||||
}
|
||||
|
||||
void mem_allocator_free(mem_allocator_t allocator, void *ptr)
|
||||
{
|
||||
if (ptr)
|
||||
gc_free_h((gc_handle_t) allocator, ptr);
|
||||
}
|
||||
|
||||
#else /* else of DEFAULT_MEM_ALLOCATOR */
|
||||
|
||||
#include "tlsf/tlsf.h"
|
||||
#include "bh_thread.h"
|
||||
|
||||
typedef struct mem_allocator_tlsf {
|
||||
tlsf_t tlsf;
|
||||
korp_mutex lock;
|
||||
}mem_allocator_tlsf;
|
||||
|
||||
mem_allocator_t
|
||||
mem_allocator_create(void *mem, uint32_t size)
|
||||
{
|
||||
mem_allocator_tlsf *allocator_tlsf;
|
||||
tlsf_t tlsf;
|
||||
char *mem_aligned = (char*)(((uintptr_t)mem + 3) & ~3);
|
||||
|
||||
if (size < 1024) {
|
||||
printf("Create mem allocator failed: pool size must be "
|
||||
"at least 1024 bytes.\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size -= mem_aligned - (char*)mem;
|
||||
mem = (void*)mem_aligned;
|
||||
|
||||
tlsf = tlsf_create_with_pool(mem, size);
|
||||
if (!tlsf) {
|
||||
printf("Create mem allocator failed: tlsf_create_with_pool failed.\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
allocator_tlsf = tlsf_malloc(tlsf, sizeof(mem_allocator_tlsf));
|
||||
if (!allocator_tlsf) {
|
||||
printf("Create mem allocator failed: tlsf_malloc failed.\n");
|
||||
tlsf_destroy(tlsf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
allocator_tlsf->tlsf = tlsf;
|
||||
|
||||
if (vm_mutex_init(&allocator_tlsf->lock)) {
|
||||
printf("Create mem allocator failed: tlsf_malloc failed.\n");
|
||||
tlsf_free(tlsf, allocator_tlsf);
|
||||
tlsf_destroy(tlsf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return allocator_tlsf;
|
||||
}
|
||||
|
||||
void
|
||||
mem_allocator_destroy(mem_allocator_t allocator)
|
||||
{
|
||||
mem_allocator_tlsf *allocator_tlsf = (mem_allocator_tlsf *)allocator;
|
||||
tlsf_t tlsf = allocator_tlsf->tlsf;
|
||||
|
||||
vm_mutex_destroy(&allocator_tlsf->lock);
|
||||
tlsf_free(tlsf, allocator_tlsf);
|
||||
tlsf_destroy(tlsf);
|
||||
}
|
||||
|
||||
void *
|
||||
mem_allocator_malloc(mem_allocator_t allocator, uint32_t size)
|
||||
{
|
||||
void *ret;
|
||||
mem_allocator_tlsf *allocator_tlsf = (mem_allocator_tlsf *)allocator;
|
||||
|
||||
if (size == 0)
|
||||
/* tlsf doesn't allow to allocate 0 byte */
|
||||
size = 1;
|
||||
|
||||
vm_mutex_lock(&allocator_tlsf->lock);
|
||||
ret = tlsf_malloc(allocator_tlsf->tlsf, size);
|
||||
vm_mutex_unlock(&allocator_tlsf->lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
mem_allocator_free(mem_allocator_t allocator, void *ptr)
|
||||
{
|
||||
if (ptr) {
|
||||
mem_allocator_tlsf *allocator_tlsf = (mem_allocator_tlsf *)allocator;
|
||||
vm_mutex_lock(&allocator_tlsf->lock);
|
||||
tlsf_free(allocator_tlsf->tlsf, ptr);
|
||||
vm_mutex_unlock(&allocator_tlsf->lock);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* end of DEFAULT_MEM_ALLOCATOR */
|
||||
|
||||
Reference in New Issue
Block a user