alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-02 13:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/heap_tracing_build_issue_for_c3_v4.3' into 'release/v4.3'

Browse Source 
heap: fix build issue with HEAP_TRACING config for C3 (v4.3)

See merge request espressif/esp-idf!14075
This commit is contained in:
Mahavir Jain
2021-06-23 03:45:39 +00:00
parent 1d05bb7c01 46d04231e6
commit b007024c62
4 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/heap/Kconfig
View File

@@ -45,6 +45,8 @@ menu "Heap memory debugging"
config HEAP_TRACING_STACK_DEPTH
int "Heap tracing stack depth"
range 0 0 if IDF_TARGET_ARCH_RISCV # Disabled for RISC-V due to `__builtin_return_address` limitation
default 0 if IDF_TARGET_ARCH_RISCV
range 0 10
default 2
depends on HEAP_TRACING

2
components/heap/include/heap_trace.inc
View File

@@ -19,7 +19,7 @@
/* Encode the CPU ID in the LSB of the ccount value */
inline static uint32_t get_ccount(void)
{
uint32_t ccount = xthal_get_ccount() & ~3;
uint32_t ccount = cpu_hal_get_cycle_count() & ~3;
#ifndef CONFIG_FREERTOS_UNICORE
ccount |= xPortGetCoreID();
#endif