Browse Source

[src] add RT_WEAK for rt_malloc_align,rt_free_align

yangjie 4 years ago
parent
commit
fa1f1ef485
2 changed files with 4 additions and 2 deletions
  1. 2 2
      src/kservice.c
  2. 2 0
      src/memheap.c

+ 2 - 2
src/kservice.c

@@ -1238,7 +1238,7 @@ RTM_EXPORT(rt_kprintf);
  *
  *
  * @return the allocated memory block on successful, otherwise returns RT_NULL
  * @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 *ptr;
     void *align_ptr;
     void *align_ptr;
@@ -1284,7 +1284,7 @@ RTM_EXPORT(rt_malloc_align);
  *
  *
  * @param ptr the memory block pointer
  * @param ptr the memory block pointer
  */
  */
-void rt_free_align(void *ptr)
+RT_WEAK void rt_free_align(void *ptr)
 {
 {
     void *real_ptr;
     void *real_ptr;
 
 

+ 2 - 0
src/memheap.c

@@ -757,6 +757,8 @@ static struct rt_memheap _heap;
 
 
 void rt_system_heap_init(void *begin_addr, void *end_addr)
 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 */
     /* initialize a default heap in the system */
     rt_memheap_init(&_heap,
     rt_memheap_init(&_heap,
                     "heap",
                     "heap",