diff options
Diffstat (limited to 'cpukit/include/rtems')
| -rw-r--r-- | cpukit/include/rtems/confdefs/wkspace.h | 21 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/stackimpl.h | 14 |
2 files changed, 24 insertions, 11 deletions
diff --git a/cpukit/include/rtems/confdefs/wkspace.h b/cpukit/include/rtems/confdefs/wkspace.h index 46bdee6da1..1db4f2d09d 100644 --- a/cpukit/include/rtems/confdefs/wkspace.h +++ b/cpukit/include/rtems/confdefs/wkspace.h @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * Copyright (C) 2020, 2021 embedded brains GmbH (http://www.embedded-brains.de) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -55,12 +55,27 @@ #include <rtems/score/stack.h> #include <rtems/sysinit.h> +#if CPU_STACK_ALIGNMENT > CPU_HEAP_ALIGNMENT + #define _CONFIGURE_TASK_STACK_ALLOC_SIZE( _stack_size ) \ + ( RTEMS_ALIGN_UP( \ + ( _stack_size ) + CONTEXT_FP_SIZE, \ + CPU_STACK_ALIGNMENT \ + ) + CPU_STACK_ALIGNMENT - CPU_HEAP_ALIGNMENT ) +#else + #define _CONFIGURE_TASK_STACK_ALLOC_SIZE( _stack_size ) \ + RTEMS_ALIGN_UP( ( _stack_size ) + CONTEXT_FP_SIZE, CPU_STACK_ALIGNMENT ) +#endif + #ifdef CONFIGURE_TASK_STACK_FROM_ALLOCATOR #define _Configure_From_stackspace( _stack_size ) \ - CONFIGURE_TASK_STACK_FROM_ALLOCATOR( _stack_size + CONTEXT_FP_SIZE ) + CONFIGURE_TASK_STACK_FROM_ALLOCATOR( \ + _CONFIGURE_TASK_STACK_ALLOC_SIZE( _stack_size ) \ + ) #else #define _Configure_From_stackspace( _stack_size ) \ - _Configure_From_workspace( _stack_size + CONTEXT_FP_SIZE ) + _Configure_From_workspace( \ + _CONFIGURE_TASK_STACK_ALLOC_SIZE( _stack_size ) \ + ) #endif #ifndef CONFIGURE_EXTRA_TASK_STACKS diff --git a/cpukit/include/rtems/score/stackimpl.h b/cpukit/include/rtems/score/stackimpl.h index c15206002c..c261f8bd4f 100644 --- a/cpukit/include/rtems/score/stackimpl.h +++ b/cpukit/include/rtems/score/stackimpl.h @@ -135,7 +135,7 @@ RTEMS_INLINE_ROUTINE size_t _Stack_Extend_size( ) { size_t extra_size; - size_t alignment_overhead; + size_t allocator_overhead; extra_size = _TLS_Get_allocation_size(); @@ -153,18 +153,16 @@ RTEMS_INLINE_ROUTINE size_t _Stack_Extend_size( * can be allocated for the stack, we have to align it up to the next stack * boundary. */ - alignment_overhead = CPU_STACK_ALIGNMENT - 1; + extra_size += CPU_STACK_ALIGNMENT - 1; -#if CPU_STACK_ALIGNMENT > CPU_HEAP_ALIGNMENT /* * If the heap allocator does not meet the stack alignment requirement, then * we have to do the stack alignment manually in _Thread_Initialize() and * need to allocate extra space for this. */ - alignment_overhead += CPU_STACK_ALIGNMENT - CPU_HEAP_ALIGNMENT; -#endif + allocator_overhead = CPU_STACK_ALIGNMENT - CPU_HEAP_ALIGNMENT; - if ( stack_size > SIZE_MAX - extra_size - alignment_overhead ) { + if ( stack_size > SIZE_MAX - extra_size - allocator_overhead ) { /* * In case of an unsigned integer overflow, saturate at the maximum value. */ @@ -172,9 +170,9 @@ RTEMS_INLINE_ROUTINE size_t _Stack_Extend_size( } stack_size += extra_size; - stack_size = RTEMS_ALIGN_UP( stack_size, CPU_STACK_ALIGNMENT ); + stack_size = RTEMS_ALIGN_DOWN( stack_size, CPU_STACK_ALIGNMENT ); - return stack_size; + return stack_size + allocator_overhead; } /** |