Просмотр исходного кода

Merge branch 'bugfix/minimal_stacksize_watchpoint_aware' into 'master'

[freertos]: Changed minimal stack size to regard watchpoint usage

See merge request espressif/esp-idf!16269
Jakob Hasse 4 лет назад
Родитель
Сommit
2e1c7d876c
1 измененных файлов с 10 добавлено и 1 удалено
  1. 10 1
      components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h

+ 10 - 1
components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h

@@ -166,10 +166,19 @@
 #define configSTACK_OVERHEAD_APPTRACE                   0
 #endif
 
+/* Stack watchpoint decreases minimum usable stack size by up to 60 bytes.
+   See FreeRTOS FREERTOS_WATCHPOINT_END_OF_STACK option in Kconfig. */
+#if CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK
+#define configSTACK_OVERHEAD_WATCHPOINT                   60
+#else
+#define configSTACK_OVERHEAD_WATCHPOINT                   0
+#endif
+
 #define configSTACK_OVERHEAD_TOTAL (                                    \
                                     configSTACK_OVERHEAD_CHECKER +      \
                                     configSTACK_OVERHEAD_OPTIMIZATION + \
-                                    configSTACK_OVERHEAD_APPTRACE       \
+                                    configSTACK_OVERHEAD_APPTRACE +     \
+                                    configSTACK_OVERHEAD_WATCHPOINT     \
                                                                         )
 
 #define configMINIMAL_STACK_SIZE                        (768 + configSTACK_OVERHEAD_TOTAL)