sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

esp32_allocateheap.c: Add a sanity check

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2021-02-08 17:34:00 +09:00 committed by Abdelatif Guettouche
parent 63c08a79be
commit 2220827463
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/xtensa/src/esp32/esp32_allocateheap.c
View File

@ -102,6 +102,12 @@
# define HEAP_REGION2_START 0x3ffe7e40 # define HEAP_REGION2_START 0x3ffe7e40
#endif #endif
#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
#define XTENSA_IMEM_REGION_SIZE CONFIG_XTENSA_IMEM_REGION_SIZE
#else
#define XTENSA_IMEM_REGION_SIZE 0
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -124,13 +130,14 @@
void up_allocate_heap(FAR void **heap_start, size_t *heap_size) void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
{ {
board_autoled_on(LED_HEAPALLOCATE); board_autoled_on(LED_HEAPALLOCATE);
#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM *heap_start = (FAR void *)&_sheap + XTENSA_IMEM_REGION_SIZE;
*heap_start = (FAR void *)&_sheap + CONFIG_XTENSA_IMEM_REGION_SIZE;
/* If the following DEBUGASSERT fails,
* probably you have too large CONFIG_XTENSA_IMEM_REGION_SIZE.
*/
DEBUGASSERT(HEAP_REGION1_END > (uintptr_t)*heap_start);
*heap_size = (size_t)(HEAP_REGION1_END - (uintptr_t)*heap_start); *heap_size = (size_t)(HEAP_REGION1_END - (uintptr_t)*heap_start);
#else
*heap_start = (FAR void *)&_sheap;
*heap_size = (size_t)(HEAP_REGION1_END - (uintptr_t)&_sheap);
#endif
} }
/**************************************************************************** /****************************************************************************