sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simulator: x86 stack needs to be aligned to 16-byte boundaries.

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-04 07:03:39 -06:00
parent 36e7a18181
commit 4cc13f8d94
3 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/sim/src/up_createstack.c
View File

@ -49,6 +49,22 @@
#include "up_internal.h"
/****************************************************************************
* Pre-processor Macros
****************************************************************************/
/* Use a stack alignment of 16 bytes. If necessary frame_size must be rounded
* up to the next boundary
*/
#define STACK_ALIGNMENT 16
/* Stack alignment macros */
#define STACK_ALIGN_MASK (STACK_ALIGNMENT-1)
#define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
#define STACK_ALIGN_UP(a) (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
/****************************************************************************
* Public Functions
****************************************************************************/
@ -87,7 +103,7 @@
int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
{
uint32_t *stack_alloc_ptr;
FAR uint8_t *stack_alloc_ptr;
int ret = ERROR;
#ifdef CONFIG_TLS
@ -108,30 +124,34 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Move up to next even word boundary if necessary */
size_t adj_stack_size = (stack_size + 3) & ~3;
size_t adj_stack_words = adj_stack_size >> 2;
size_t adj_stack_size = STACK_ALIGN_UP(stack_size);
/* Allocate the memory for the stack */
#ifdef CONFIG_TLS
stack_alloc_ptr = (FAR uint32_t *)kumm_memalign(TLS_STACK_ALIGN, adj_stack_size);
stack_alloc_ptr = (FAR uint8_t *)kumm_memalign(TLS_STACK_ALIGN, adj_stack_size);
#else /* CONFIG_TLS */
stack_alloc_ptr = (FAR uint32_t *)kumm_malloc(adj_stack_size);
stack_alloc_ptr = (FAR uint8_t *)kumm_malloc(adj_stack_size);
#endif /* CONFIG_TLS */
/* Was the allocation successful? */
if (stack_alloc_ptr)
{
/* This is the address of the last word in the allocation */
/* This is the address of the last aligned word in the allocation.
* NOTE that stack_alloc_ptr + adj_stack_size may lie one byte
* outside of the stack. This is okay for an inital state; the
* first pushed values will be within the stack allocation.
*/
FAR void *adj_stack_ptr = &stack_alloc_ptr[adj_stack_words - 1];
uintptr_t adj_stack_addr =
STACK_ALIGN_DOWN((uintptr_t)stack_alloc_ptr + adj_stack_size);
/* Save the values in the TCB */
tcb->adj_stack_size = adj_stack_size;
tcb->stack_alloc_ptr = stack_alloc_ptr;
tcb->adj_stack_ptr = adj_stack_ptr;
tcb->adj_stack_ptr = (FAR void *)adj_stack_addr;
#ifdef CONFIG_TLS
/* Initialize the TLS data structure */

4
arch/sim/src/up_stackframe.c
View File

@ -53,11 +53,11 @@
* Pre-processor Macros
****************************************************************************/
/* Use a stack alignment of 4 bytes. If necessary frame_size must be rounded
/* Use a stack alignment of 16 bytes. If necessary frame_size must be rounded
* up to the next boundary
*/
#define STACK_ALIGNMENT 4
#define STACK_ALIGNMENT 16
/* Stack alignment macros */

36
arch/sim/src/up_usestack.c
View File

@ -48,6 +48,22 @@
#include "up_internal.h"
/****************************************************************************
* Pre-processor Macros
****************************************************************************/
/* Use a stack alignment of 16 bytes. If necessary frame_size must be rounded
* up to the next boundary
*/
#define STACK_ALIGNMENT 16
/* Stack alignment macros */
#define STACK_ALIGN_MASK (STACK_ALIGNMENT-1)
#define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
#define STACK_ALIGN_UP(a) (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
/****************************************************************************
* Public Functions
****************************************************************************/
@ -82,29 +98,33 @@
int up_use_stack(FAR struct tcb_s *tcb, FAR void *stack, size_t stack_size)
{
FAR size_t *adj_stack_ptr;
uintptr_t adj_stack_addr;
size_t adj_stack_size;
size_t adj_stack_words;
#ifdef CONFIG_TLS
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
/* Move up to next even word boundary if necessary */
/* Move down to next even word boundary within the pre-allocated stack
* memory, if necessary.
*/
adj_stack_size = stack_size & ~3;
adj_stack_words = adj_stack_size >> 2;
adj_stack_size = STACK_ALIGN_DOWN(stack_size);
/* This is the address of the last word in the allocation */
/* This is the address of the last word in the allocation.
* NOTE that stack_alloc_ptr + adj_stack_size may lie one byte
* outside of the stack. This is okay for an inital state; the
* first pushed values will be within the stack allocation.
*/
adj_stack_ptr = &((FAR size_t *)stack)[adj_stack_words - 1];
adj_stack_addr = STACK_ALIGN_DOWN((uintptr_t)stack + adj_stack_size);
/* Save the values in the TCB */
tcb->adj_stack_size = adj_stack_size;
tcb->stack_alloc_ptr = stack;
tcb->adj_stack_ptr = adj_stack_ptr;
tcb->adj_stack_ptr = (FAR void *)adj_stack_addr;
#ifdef CONFIG_TLS
/* Initialize the TLS data structure */