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

Merge pull request #7950 from c1728p9/l4_malloc_fix 

Fix memory allocation on STM32L4 devices
pull/8048/head
Cruz Monrreal 2018-09-07 22:50:05 -05:00 committed by GitHub
parent 76827c3704 e084865e8e
commit d311a96061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/TARGET_STM/TARGET_STM32L4/l4_retarget.c
View File

@ -38,8 +38,6 @@
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 STM32L4_HEAP_ALIGN 32
#define STM32L4_ALIGN_UP(X, ALIGN) (((X) + (ALIGN) - 1) & ~((ALIGN) - 1))
/** /**
* The default implementation of _sbrk() (in platform/mbed_retarget.cpp) for GCC_ARM requires one-region model (heap and * The default implementation of _sbrk() (in platform/mbed_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, * stack share one region), which doesn't fit two-region model (heap and stack are two distinct regions), for example,
@ -50,10 +48,10 @@ 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 = STM32L4_ALIGN_UP(heap_ind, STM32L4_HEAP_ALIGN); uint32_t heap_ind_old = heap_ind;
uint32_t heap_ind_new = STM32L4_ALIGN_UP(heap_ind_old + incr, STM32L4_HEAP_ALIGN); uint32_t heap_ind_new = heap_ind_old + incr;
if (heap_ind_new > &__mbed_krbs_start) { if (heap_ind_new > (uint32_t)&__mbed_krbs_start) {
errno = ENOMEM; errno = ENOMEM;
return (void *) - 1; return (void *) - 1;
} }