alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

FreeRTOS: Make the default stack alignment 16 for Xtensa

Browse Source
This commit is contained in:
Omar Chebib 2022-11-11 15:00:42 +08:00
parent 7ae5ec946d
commit b2ddedb941
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/freertos/port/riscv/port.c
View File

@ -95,7 +95,7 @@
#include "portmacro.h"
#include "port_systick.h"
_Static_assert(portBYTE_ALIGNMENT == 16, "portBYTE_ALIGNMENT must be set to 16");
/* ---------------------------------------------------- Variables ------------------------------------------------------
*
@ -248,6 +248,8 @@ StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxC
frame->gp = (UBaseType_t)&__global_pointer$;
frame->tp = (UBaseType_t)threadptr;
configASSERT(((uint32_t) frame & portBYTE_ALIGNMENT_MASK) == 0);
//TODO: IDF-2393
return (StackType_t *)frame;
}

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

@ -106,7 +106,7 @@ typedef uint32_t TickType_t;
#define portCRITICAL_NESTING_IN_TCB 0
#define portSTACK_GROWTH ( -1 )
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
#define portBYTE_ALIGNMENT 4
#define portBYTE_ALIGNMENT 16 // Xtensa Windowed ABI requires the stack pointer to always be 16-byte aligned. See "isa_rm.pdf 8.1.1 Windowed Register Usage and Stack Layout"
#define portNOP() XT_NOP()

4
components/freertos/port/xtensa/port.c
View File

@ -66,6 +66,8 @@
#include "task.h" /* Required for TaskHandle_t, tskNO_AFFINITY, and vTaskStartScheduler */
#include "port_systick.h"
_Static_assert(portBYTE_ALIGNMENT == 16, "portBYTE_ALIGNMENT must be set to 16");
_Static_assert(tskNO_AFFINITY == CONFIG_FREERTOS_NO_AFFINITY, "incorrect tskNO_AFFINITY value");
@ -241,6 +243,8 @@ StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t px
p[2] = (((uint32_t) p) + 12 + XCHAL_TOTAL_SA_ALIGN - 1) & -XCHAL_TOTAL_SA_ALIGN;
#endif /* XCHAL_CP_NUM */
configASSERT(((uint32_t) sp & portBYTE_ALIGNMENT_MASK) == 0);
return sp;
}