espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-15 08:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_stack_overflow_error' into 'master'

Browse Source 
Fix FreeRTOS stack overflow checking missing

See merge request sdk/ESP8266_RTOS_SDK!281
This commit is contained in:
Wu Jian Gang
2018-07-10 18:43:49 +08:00
parent df09ed2874 d5b6457704
commit 3fc1d9e30e
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/freertos/port/esp8266/panic.c
View File

@ -93,6 +93,7 @@ void IRAM_ATTR panicHandler(void *frame)
// for panic the function that disable cache // for panic the function that disable cache
Cache_Read_Enable_New(); Cache_Read_Enable_New();
task_info_t *task;
int *regs = (int *)frame; int *regs = (int *)frame;
int x, y; int x, y;
const char *sdesc[] = { const char *sdesc[] = {
@ -108,35 +109,33 @@ void IRAM_ATTR panicHandler(void *frame)
/* NMI can interrupt exception. */ /* NMI can interrupt exception. */
ETS_INTR_LOCK(); ETS_INTR_LOCK();
ets_printf("\r\n\r\n");
if (_Pri_3_NMICount == -1) { if (_Pri_3_NMICount == -1) {
ets_printf("\nWatch dog triggle:\n\n"); ets_printf("Soft watch dog triggle:\r\n\r\n");
show_critical_info(); show_critical_info();
} else if (xPortInIsrContext()) { } else if (xPortInIsrContext())
ets_printf("\nISR:\n\n"); ets_printf("Core 0 was running in ISR context:\r\n\r\n");
} else {
task_info_t *task = xTaskGetCurrentTaskHandle();
if (task) {
if ((task = (task_info_t *)xTaskGetCurrentTaskHandle())) {
StackType_t *pdata = task->pxStack; StackType_t *pdata = task->pxStack;
StackType_t *end = task->pxEndOfStack + 4; StackType_t *end = task->pxEndOfStack + 4;
ets_printf("\nTask stack [%s] stack from [%p] to [%p], total [%d] size\n\n", ets_printf("Task stack [%s] stack from [%p] to [%p], total [%d] size\r\n\r\n",
task->pcTaskName, pdata, end, end - pdata + 4); task->pcTaskName, pdata, end, end - pdata + 4);
panic_stack(pdata, end); panic_stack(pdata, end);
ets_printf("\n"); ets_printf("\r\n\r\n");
} else { } else {
ets_printf("\nNo task\n\n"); ets_printf("No task\r\n\r\n");
}
} }
for (x = 0; x < 20; x += 4) { for (x = 0; x < 20; x += 4) {
for (y = 0; y < 4; y++) { for (y = 0; y < 4; y++) {
ets_printf("%8s: 0x%08x ", sdesc[x + y], regs[x + y + 1]); ets_printf("%8s: 0x%08x ", sdesc[x + y], regs[x + y + 1]);
} }
ets_printf("\n"); ets_printf("\r\n");
} }
/* /*

15
components/freertos/port/esp8266/port.c
View File

@ -340,19 +340,14 @@ int IRAM_ATTR xPortInIsrContext(void)
return _xt_isr_status != 0; return _xt_isr_status != 0;
} }
void vApplicationStackOverflowHook(xTaskHandle xTask, signed char *pcTaskName) void __attribute__((weak)) vApplicationStackOverflowHook(xTaskHandle xTask, const char *pcTaskName)
{ {
printf("task [%s] stask overflow\n", pcTaskName); int *p = NULL;
}
void IRAM_ATTR __taskEXIT_CRITICAL(void) ets_printf("***ERROR*** A stack overflow in task %s has been detected.\r\n", pcTaskName);
{
portEXIT_CRITICAL();
}
void IRAM_ATTR __taskENTER_CRITICAL(void) /* cause a exception to jump into panic function */
{ *p = 0;
portENTER_CRITICAL();
} }
signed portBASE_TYPE xTaskGenericCreate(TaskFunction_t pxTaskCode, signed portBASE_TYPE xTaskGenericCreate(TaskFunction_t pxTaskCode,