alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 20:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

heap: add check for usage of flash content from iram

Browse Source 
this commits:
- adds build-time test to check that no call to flash regions are done from IRAM functions

- resolves problems related to IRAM function using content in flash memory

- update heap_caps_alloc_failed to use a default function name in DRAM
  when necessary instead of creating a function name variable in DRAM for
  each call of heap_caps_alloc_failed. This allows to save some extra bytes
  in RAM.
This commit is contained in:
Guillaume Souchere
2022-11-04 15:48:09 +01:00
parent 5dc0481d21
commit 0376e6ec79
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/heap/heap_caps.c
View File

@@ -14,7 +14,7 @@
#include "esp_log.h"
#include "heap_private.h"
#include "esp_system.h"
#include "esp_private/cache_utils.h"
/* Forward declaration for base function, put in IRAM.
* These functions don't check for errors after trying to allocate memory. */
@@ -56,10 +56,16 @@ IRAM_ATTR static void *dram_alloc_to_iram_addr(void *addr, size_t len)
}
static void heap_caps_alloc_failed(size_t requested_size, uint32_t caps, const char *function_name)
IRAM_ATTR static void heap_caps_alloc_failed(size_t requested_size, uint32_t caps, const char *function_name)
{
static const DRAM_ATTR char *default_func_name = "<function_name>";
if (alloc_failed_callback) {
alloc_failed_callback(requested_size, caps, function_name);
if (!spi_flash_cache_enabled() && !esp_ptr_internal(function_name)) {
alloc_failed_callback(requested_size, caps, default_func_name);
}
else {
alloc_failed_callback(requested_size, caps, function_name);
}
}
#ifdef CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS