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

riscv: Fixes GDB backtrace end function to point to prvTaskExitError

Browse Source
This commit is contained in:
Alexey Gerenkov 2022-01-27 12:06:30 +03:00 committed by Ivan Grokhotkov
parent 54569fb001
commit 088e940528
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/freertos/FreeRTOS-Kernel/portable/riscv/port.c
View File

@ -115,7 +115,7 @@ void vPortEndScheduler(void)
// ------------------------ Stack -------------------------- // ------------------------ Stack --------------------------
static void prvTaskExitError(void) __attribute__((noreturn)) static void _prvTaskExitError(void)
{ {
/* A function that implements a task must not exit or attempt to return to /* A function that implements a task must not exit or attempt to return to
its caller as there is nothing to return to. If a task wants to exit it its caller as there is nothing to return to. If a task wants to exit it
@ -128,6 +128,15 @@ static void prvTaskExitError(void)
abort(); abort();
} }
__attribute__((naked)) static void prvTaskExitError(void)
{
asm volatile(".option push\n" \
".option norvc\n" \
"nop\n" \
".option pop");
_prvTaskExitError();
}
StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters) StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters)
{ {
extern uint32_t __global_pointer$; extern uint32_t __global_pointer$;
@ -190,7 +199,9 @@ StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxC
sp -= RV_STK_FRMSZ; sp -= RV_STK_FRMSZ;
RvExcFrame *frame = (RvExcFrame *)sp; RvExcFrame *frame = (RvExcFrame *)sp;
memset(frame, 0, sizeof(*frame)); memset(frame, 0, sizeof(*frame));
frame->ra = (UBaseType_t)prvTaskExitError; /* Shifting RA into prvTaskExitError is necessary to make GDB backtrace ending inside that function.
Otherwise backtrace will end in the function laying just before prvTaskExitError in address space. */
frame->ra = (UBaseType_t)prvTaskExitError + 4/*nop size*/;
frame->mepc = (UBaseType_t)pxCode; frame->mepc = (UBaseType_t)pxCode;
frame->a0 = (UBaseType_t)pvParameters; frame->a0 = (UBaseType_t)pvParameters;
frame->gp = (UBaseType_t)&__global_pointer$; frame->gp = (UBaseType_t)&__global_pointer$;