Skip to content

Commit d569fb9

Browse files
Remove access to pxCurrentTCB when configCHECK_FOR_STACK_OVERFLOW == 2
Co-authored-by: Jeff Tenney <[email protected]>
1 parent 94e9b88 commit d569fb9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/stack_macros.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@
164164
#define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \
165165
do \
166166
{ \
167-
const uint32_t * const pulStack = ( uint32_t * ) pxCurrentTCB->pxStack; \
168-
const uint32_t ulCheckValue = ( uint32_t ) 0xa5a5a5a5U; \
169167
const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \
168+
const uint32_t * const pulStack = ( uint32_t * ) pxTCB->pxStack; \
169+
const uint32_t ulCheckValue = ( uint32_t ) 0xa5a5a5a5U; \
170170
\
171171
if( ( pxTCB->pxTopOfStack <= pxTCB->pxStack + portSTACK_LIMIT_PADDING ) || \
172172
( pulStack[ 0 ] != ulCheckValue ) || \
@@ -213,13 +213,13 @@
213213
#define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \
214214
do \
215215
{ \
216-
int8_t * pcEndOfStack = ( int8_t * ) pxCurrentTCB->pxEndOfStack; \
216+
const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \
217+
int8_t * pcEndOfStack = ( int8_t * ) pxTCB->pxEndOfStack; \
217218
static const uint8_t ucExpectedStackBytes[] = { tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, \
218219
tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, \
219220
tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, \
220221
tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, \
221222
tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE }; \
222-
const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \
223223
\
224224
pcEndOfStack -= sizeof( ucExpectedStackBytes ); \
225225
\

0 commit comments

Comments
 (0)