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

Fix missing wrapping of calloc_r with uVisor enabled. 

uVisor only wraps malloc_r, realloc_r and free_r, not calloc_r!
pull/2534/head
Niklas Hauser 2016-08-24 10:22:05 +01:00
parent 22acfbf077
commit 7c0cc50677
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hal/common/retarget.cpp
View File

@ -500,9 +500,11 @@ void mbed_stats_heap_get(mbed_stats_heap_t *stats)
#include "uvisor-lib/uvisor-lib.h" #include "uvisor-lib/uvisor-lib.h"
#endif/* FEATURE_UVISOR */ #endif/* FEATURE_UVISOR */
#ifndef FEATURE_UVISOR
extern "C" { extern "C" {
/* uVisor wraps malloc_r, realloc_r and free_r, but not calloc_r! */
#ifndef FEATURE_UVISOR
extern "C" void __malloc_lock( struct _reent *_r ); extern "C" void __malloc_lock( struct _reent *_r );
extern "C" void __malloc_unlock( struct _reent *_r ); extern "C" void __malloc_unlock( struct _reent *_r );
@ -586,6 +588,9 @@ void __wrap__free_r(struct _reent * r, void * ptr) {
malloc_stats_mutex->unlock(); malloc_stats_mutex->unlock();
#endif #endif
} }
#endif/* FEATURE_UVISOR */
void* __wrap__calloc_r(struct _reent * r, size_t num, size_t size) { void* __wrap__calloc_r(struct _reent * r, size_t num, size_t size) {
#if !defined(MBED_HEAP_STATS_ENABLED ) || !MBED_HEAP_STATS_ENABLED #if !defined(MBED_HEAP_STATS_ENABLED ) || !MBED_HEAP_STATS_ENABLED
extern void* __real__calloc_r(struct _reent * r, size_t num, size_t size); extern void* __real__calloc_r(struct _reent * r, size_t num, size_t size);
@ -603,7 +608,6 @@ void* __wrap__calloc_r(struct _reent * r, size_t num, size_t size) {
#endif #endif
} }
} }
#endif/* FEATURE_UVISOR */
extern "C" WEAK void software_init_hook_rtos(void) extern "C" WEAK void software_init_hook_rtos(void)
{ {