espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-21 17:16:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(freertos): Change task stack unit from "unsigned long" to "unsigned char"

Browse Source
This commit is contained in:
Dong Heng
2018-07-09 11:24:16 +08:00
parent d807a8c273
commit 0a0db61155
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/port/esp8266/include/freertos/portmacro.h
View File

@ -105,7 +105,7 @@ extern "C" {
#define portDOUBLE double #define portDOUBLE double
#define portLONG long #define portLONG long
#define portSHORT short #define portSHORT short
#define portSTACK_TYPE unsigned portLONG #define portSTACK_TYPE unsigned char
#define portBASE_TYPE long #define portBASE_TYPE long
#define BaseType_t portBASE_TYPE #define BaseType_t portBASE_TYPE

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

@ -54,8 +54,9 @@ typedef struct task_info
StackType_t *pxEndOfStack; StackType_t *pxEndOfStack;
} task_info_t; } task_info_t;
static void IRAM_ATTR panic_stack(StackType_t *start, StackType_t *end) static void IRAM_ATTR panic_stack(StackType_t *start_stk, StackType_t *end_stk)
{ {
uint32_t *start = (uint32_t *)start_stk, *end = (uint32_t *)end_stk;
size_t i, j; size_t i, j;
size_t size = end - start + 1; size_t size = end - start + 1;
@ -118,10 +119,10 @@ void IRAM_ATTR panicHandler(void *frame)
if (task) { if (task) {
StackType_t *pdata = task->pxStack; StackType_t *pdata = task->pxStack;
StackType_t *end = task->pxEndOfStack + 1; StackType_t *end = task->pxEndOfStack + 4;
ets_printf("\nTask stack [%s] stack from [%p] to [%p], total [%d] size\n\n", ets_printf("\nTask stack [%s] stack from [%p] to [%p], total [%d] size\n\n",
task->pcTaskName, pdata, end, end - pdata + 1); task->pcTaskName, pdata, end, end - pdata + 4);
panic_stack(pdata, end); panic_stack(pdata, end);

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

@ -107,16 +107,16 @@ void _xt_timer_int1(void);
/* /*
* See header file for description. * See header file for description.
*/ */
portSTACK_TYPE* pxPortInitialiseStack(portSTACK_TYPE* pxTopOfStack, pdTASK_CODE pxCode, void* pvParameters) StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters)
{ {
#define SET_STKREG(r,v) sp[(r) >> 2] = (portSTACK_TYPE)(v) #define SET_STKREG(r,v) sp[(r) >> 2] = (unsigned long)(v)
portSTACK_TYPE* sp, *tp; unsigned long *sp, *tp, *stk = (unsigned long *)pxTopOfStack;
/* Create interrupt stack frame aligned to 16 byte boundary */ /* Create interrupt stack frame aligned to 16 byte boundary */
sp = (portSTACK_TYPE*)(((INT32U)(pxTopOfStack + 1) - XT_CP_SIZE - XT_STK_FRMSZ) & ~0xf); sp = (unsigned long *)(((INT32U)(stk + 1) - XT_CP_SIZE - XT_STK_FRMSZ) & ~0xf);
/* Clear the entire frame (do not use memset() because we don't depend on C library) */ /* Clear the entire frame (do not use memset() because we don't depend on C library) */
for (tp = sp; tp <= pxTopOfStack; ++tp) { for (tp = sp; tp <= stk; ++tp) {
*tp = 0; *tp = 0;
} }
@ -135,7 +135,7 @@ portSTACK_TYPE* pxPortInitialiseStack(portSTACK_TYPE* pxTopOfStack, pdTASK_CODE
SET_STKREG(XT_STK_PS, PS_UM | PS_EXCM | PS_WOE | PS_CALLINC(1)); SET_STKREG(XT_STK_PS, PS_UM | PS_EXCM | PS_WOE | PS_CALLINC(1));
#endif #endif
return sp; return (StackType_t *)sp;
} }
void IRAM_ATTR PendSV(char req) void IRAM_ATTR PendSV(char req)
@ -361,7 +361,7 @@ signed portBASE_TYPE xTaskGenericCreate(TaskFunction_t pxTaskCode,
void *pvParameters, void *pvParameters,
unsigned portBASE_TYPE uxPriority, unsigned portBASE_TYPE uxPriority,
TaskHandle_t *pxCreatedTask, TaskHandle_t *pxCreatedTask,
portSTACK_TYPE *puxStackBuffer, StackType_t *puxStackBuffer,
const MemoryRegion_t * const xRegions) const MemoryRegion_t * const xRegions)
{ {
(void)puxStackBuffer; (void)puxStackBuffer;