esp_common: added a macro to allow call functions using user allocated stack

pull/4618/head
Felipe Neves 2019-11-15 16:07:57 +08:00
rodzic c0d12988d3
commit debcc68c41
4 zmienionych plików z 98 dodań i 0 usunięć

Wyświetl plik

@ -7,6 +7,7 @@ if(BOOTLOADER_BUILD)
else()
# Regular app build
set(srcs "src/dbg_stubs.c"
"src/esp_espression_with_stack_asm.S"
"src/esp_err_to_name.c"
"src/esp_timer.c"
"src/ets_timer_legacy.c"

Wyświetl plik

@ -0,0 +1,35 @@
#ifndef __ESP_EXPRESSION_WITH_STACK_H
#define __ESP_EXPRESSION_WITH_STACK_H
#include "freertos/FreeRTOS.h"
#include "freertos/semphr.h"
/**
* @brief Executes a 1-line expression with a application alocated stack
* @param lock Mutex object to protect in case of shared stack
* @param stack Pointer to user alocated stack, it must points to its top
* @param expression Expression or function to be executed using the stack
*/
#define EXECUTE_EXPRESSION_WITH_STACK(lock, stack, expression) \
({ \
if(lock) { \
uint32_t backup; \
xSemaphoreTake(lock, portMAX_DELAY); \
switch_stack_enter(stack, &backup); \
{ \
expression; \
} \
switch_stack_exit(&backup); \
xSemaphoreGive(lock); \
} \
})
/**
* These functions are intended to be use by the macro above, and
* Should never be called directly, otherwise crashes could
* occur
*/
extern void switch_stack_enter(portSTACK_TYPE *stack, uint32_t *backup_stack);
extern void switch_stack_exit(uint32_t *backup_stack);
#endif

Wyświetl plik

@ -0,0 +1,29 @@
#include <xtensa/coreasm.h>
#include <freertos/xtensa_context.h>
.text
/**
* extern void switch_stack_enter(portSTACK_TYPE *stack, portSTACK_TYPE *backup_stack);
*/
.globl switch_stack_enter
.type switch_stack_enter,@function
.align 4
switch_stack_enter:
entry sp, 0x10
mov a4, a1
s32i a4, a3, 0 /* on a3 there is a safe place to save the current stack */
l32i a4, a2, 0 /* obtains the user allocated stack buffer */
mov a1, a4 /* sp register now contains caller specified stack */
retw
/**
* extern void switch_stack_exit(portSTACK_TYPE *backup_stack);
*/
.globl switch_stack_exit
.type switch_stack_exit,@function
.align 4
switch_stack_exit:
entry sp, 0x10
l32i a4, a2, 0 /* recover the original task stack */
mov a1, a4 /* put it on sp register again */
retw

Wyświetl plik

@ -0,0 +1,33 @@
#include <stdio.h>
#include "unity.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/semphr.h"
#include "sdkconfig.h"
#include "soc/rtc.h"
#include "esp_system.h"
#include "test_utils.h"
#include "esp_expression_with_stack.h"
#include <stdio.h>
static portSTACK_TYPE shared_stack[8192];
static portSTACK_TYPE *ext_stack_top = (portSTACK_TYPE *)&shared_stack[0] + (sizeof(shared_stack) / sizeof(portSTACK_TYPE));
//makes sure this is not the task stack...
void check_stack(portSTACK_TYPE *sp)
{
StaticTask_t *hacked_task = (StaticTask_t *)xTaskGetCurrentTaskHandle();
portSTACK_TYPE *task_sp = (portSTACK_TYPE *)hacked_task->pxDummy1;
TEST_ASSERT((intptr_t)sp <= (intptr_t)ext_stack_top);
TEST_ASSERT((intptr_t)sp >= (intptr_t)&shared_stack);
TEST_ASSERT((intptr_t)task_sp < (intptr_t)&shared_stack ||
(intptr_t)task_sp >= (intptr_t)&ext_stack_top);
}
TEST_CASE("test printf using shared buffer stack", "[newlib]")
{
SemaphoreHandle_t printf_lock = xSemaphoreCreateMutex();
EXECUTE_EXPRESSION_WITH_STACK(printf_lock, ext_stack_top, printf("Executing this from external stack! \n"));
EXECUTE_EXPRESSION_WITH_STACK(printf_lock, ext_stack_top, check_stack(ext_stack_top));
}