fix newlib nano _sbrk() is not linked for checking heap

Author: hathach

cores/nRF5/common_func.h

@@ -114,12 +114,6 @@
 //--------------------------------------------------------------------+
 // DEBUG HELPER
 //--------------------------------------------------------------------+
-#if CFG_DEBUG == 2
-  #define malloc_named( name, size )            ({ PRINTF("[malloc] %s : %d\r\n", name, size); malloc(size); })
-#else
-  #define malloc_named( name, size )            malloc ( size )
-#endif
-
 const char* dbg_err_str(int32_t err_id); // TODO move to other place
 
 #if CFG_DEBUG

cores/nRF5/linker/nrf52832_s132_v6.ld

@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0x6D000-0x26000
+  FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0x6D000 - 0x26000
 
   /* SRAM required by S132 depend on
    * - Attribute Table Size

cores/nRF5/new.cpp

@@ -19,6 +19,10 @@
 #include <stdlib.h>
 #include "rtos.h"
 
+#include <errno.h>
+#include <sys/stat.h>
+#include <malloc.h>
+
 void *operator new(size_t size) {
   return rtos_malloc(size);
 }
@@ -42,3 +46,46 @@ void operator delete(void * ptr, unsigned int) {
 void operator delete[](void * ptr, unsigned int) {
   rtos_free(ptr);
 }
+
+
+extern "C"
+{
+
+// defined in linker script
+extern unsigned char __HeapBase[];
+extern unsigned char __HeapLimit[];
+
+static unsigned char *sbrk_heap_top = __HeapBase;
+
+__attribute__((used))
+caddr_t _sbrk( int incr )
+{
+  unsigned char *prev_heap;
+
+  if ( sbrk_heap_top + incr > __HeapLimit )
+  {
+    /* Out of dynamic memory heap space */
+    errno = ENOMEM;
+    return (caddr_t) -1;
+  }
+
+  prev_heap = sbrk_heap_top;
+
+  sbrk_heap_top += incr;
+
+  return (caddr_t) prev_heap;
+}
+
+void __malloc_lock(struct _reent *ptr)
+{
+  (void) ptr;
+  vTaskSuspendAll();
+}
+
+void __malloc_unlock(struct _reent *ptr)
+{
+  (void) ptr;
+  xTaskResumeAll();
+}
+
+}

cores/nRF5/rtos.cpp

@@ -93,13 +93,14 @@ void yield(void)
 
 void vApplicationStackOverflowHook( TaskHandle_t xTask, char *pcTaskName )
 {
-  LOG_LV1("RTOS", "%s Stack Overflow !!!", pcTaskName);
-  while(1) yield();
+  LOG_LV1("RTOS", "Task %s: stack Overflow !!!", pcTaskName);
+  while(CFG_DEBUG) yield();
 }
 
 void vApplicationMallocFailedHook(void)
 {
-  LOG_LV1("RTOS", "Failed to Malloc");
+  LOG_LV1("RTOS", "Task %s: failed to Malloc", pcTaskGetName(xTaskGetCurrentTaskHandle()));
+  while(CFG_DEBUG) yield();
 }
 
 /* configSUPPORT_STATIC_ALLOCATION is set to 1, so the application must provide an

cores/nRF5/syscall_newlib.c

@@ -60,7 +60,7 @@ Adafruit_FIFO::Adafruit_FIFO(uint8_t item_size, uint16_t depth)
 
 void Adafruit_FIFO::begin(void)
 {
-  _buffer = (uint8_t*) malloc(_item_size*_depth);
+  _buffer = (uint8_t*) rtos_malloc(_item_size*_depth);
   _mutex = xSemaphoreCreateMutex();
 }