Fix heap get for split heap (#416)

* when split_heap, add 2nd heap size for total heap

* add mbed_heap_size_total var

Author: JojoS62

cmsis/device/rtos/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c

@@ -60,9 +60,13 @@ void software_init_hook(void)
     mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start;
     mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0;
     mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0;
+
+    mbed_heap_size_total = mbed_heap_size + mbed_heap_size_0;
 #else
     mbed_heap_start = (unsigned char *) &__end__;
     mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__;
+
+    mbed_heap_size_total = mbed_heap_size;
 #endif
 
     mbed_init();

cmsis/device/rtos/include/mbed_boot.h

@@ -57,6 +57,7 @@ extern "C" {
 /* Heap limits - only used if set */
 extern unsigned char *mbed_heap_start;
 extern uint32_t mbed_heap_size;
+extern uint32_t mbed_heap_size_total;
 
 #if defined(MBED_SPLIT_HEAP)
 extern unsigned char *mbed_heap_start_0;

platform/source/mbed_alloc_wrappers.cpp

@@ -73,8 +73,8 @@ static int get_malloc_block_total_size(void *ptr)
 void mbed_stats_heap_get(mbed_stats_heap_t *stats)
 {
 #if MBED_HEAP_STATS_ENABLED
-    extern uint32_t mbed_heap_size;
-    heap_stats.reserved_size = mbed_heap_size;
+    extern uint32_t mbed_heap_size_total;
+    heap_stats.reserved_size = mbed_heap_size_total;
 
     malloc_stats_mutex->lock();
     memcpy(stats, &heap_stats, sizeof(mbed_stats_heap_t));

platform/source/mbed_retarget.cpp

@@ -119,6 +119,7 @@ extern const char __stderr_name[] = "/stderr";
 
 unsigned char *mbed_heap_start = 0;
 uint32_t mbed_heap_size = 0;
+uint32_t mbed_heap_size_total = 0;
 
 #if defined(MBED_SPLIT_HEAP)
 unsigned char *mbed_heap_start_0 = 0;

platform/source/mbed_sdk_boot.c

@@ -174,9 +174,13 @@ void software_init_hook(void)
     mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start;
     mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0;
     mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0;
+
+    mbed_heap_size_total = mbed_heap_size + mbed_heap_size_0;
 #else
     mbed_heap_start = (unsigned char *) &__end__;
     mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__;
+
+    mbed_heap_size_total = mbed_heap_size;
 #endif
 
     mbed_init();