diff options
| author | Bernard Xiong <[email protected]> | 2021-06-12 11:56:52 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-12 11:56:52 +0800 |
| commit | 2be1cb420f8d40a8c0d440941e1b0e46f327ef60 (patch) | |
| tree | 60ed00b65f9071c0540d6346de66919a3412fab0 /src | |
| parent | a52e147ceab7df3e2fef29498ecfd27bbb4e0cf3 (diff) | |
| parent | fa1f1ef485734d990f9a5aecb001d3a0aa0eb59a (diff) | |
Merge pull request #4788 from yangjie11/memheap
[src] add RT_WEAK for rt_malloc_align,rt_free_align
Diffstat (limited to 'src')
| -rw-r--r-- | src/kservice.c | 4 | ||||
| -rw-r--r-- | src/memheap.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/kservice.c b/src/kservice.c index 7ed05b6651..40040f7885 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1238,7 +1238,7 @@ RTM_EXPORT(rt_kprintf); * * @return the allocated memory block on successful, otherwise returns RT_NULL */ -void *rt_malloc_align(rt_size_t size, rt_size_t align) +RT_WEAK void *rt_malloc_align(rt_size_t size, rt_size_t align) { void *ptr; void *align_ptr; @@ -1284,7 +1284,7 @@ RTM_EXPORT(rt_malloc_align); * * @param ptr the memory block pointer */ -void rt_free_align(void *ptr) +RT_WEAK void rt_free_align(void *ptr) { void *real_ptr; diff --git a/src/memheap.c b/src/memheap.c index d3ad6d2c36..779988e92f 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -757,6 +757,8 @@ static struct rt_memheap _heap; void rt_system_heap_init(void *begin_addr, void *end_addr) { + RT_ASSERT((rt_uint32_t)end_addr > (rt_uint32_t)begin_addr); + /* initialize a default heap in the system */ rt_memheap_init(&_heap, "heap", |