ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[M487] Change sbrk() allocation to be 32-byte aligned

pull/4608/head
ccli8 2016-12-27 17:42:43 +08:00
parent acee0379c7
commit 95e0bc094a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_GCC_ARM/m480_retarget.c
View File

@ -11,10 +11,13 @@
#include "M480.h" #include "M480.h"
#include <errno.h> #include <errno.h>
#include "nu_miscutil.h"
extern uint32_t __mbed_sbrk_start; extern uint32_t __mbed_sbrk_start;
extern uint32_t __mbed_krbs_start; extern uint32_t __mbed_krbs_start;
#define NU_HEAP_ALIGN 32
/** /**
* The default implementation of _sbrk() (in common/retarget.cpp) for GCC_ARM requires one-region model (heap and stack share one region), which doesn't * The default implementation of _sbrk() (in common/retarget.cpp) for GCC_ARM requires one-region model (heap and stack share one region), which doesn't
* fit two-region model (heap and stack are two distinct regions), for example, NUMAKER-PFM-NUC472 locates heap on external SRAM. Define __wrap__sbrk() to * fit two-region model (heap and stack are two distinct regions), for example, NUMAKER-PFM-NUC472 locates heap on external SRAM. Define __wrap__sbrk() to
@ -23,8 +26,8 @@ extern uint32_t __mbed_krbs_start;
void *__wrap__sbrk(int incr) void *__wrap__sbrk(int incr)
{ {
static uint32_t heap_ind = (uint32_t) &__mbed_sbrk_start; static uint32_t heap_ind = (uint32_t) &__mbed_sbrk_start;
uint32_t heap_ind_old = heap_ind; uint32_t heap_ind_old = NU_ALIGN_UP(heap_ind, NU_HEAP_ALIGN);
uint32_t heap_ind_new = (heap_ind_old + incr + 7) & ~7; uint32_t heap_ind_new = NU_ALIGN_UP(heap_ind_old + incr, NU_HEAP_ALIGN);
if (heap_ind_new > &__mbed_krbs_start) { if (heap_ind_new > &__mbed_krbs_start) {
errno = ENOMEM; errno = ENOMEM;