Merge d569fb9f7c into 4ee6a1f22f

Remove access to pxCurrentTCB when configCHECK_FOR_STACK_OVERFLOW == 2
Co-authored-by: Jeff Tenney <jeff.tenney@gmail.com>
2025-07-04 11:27:16 -04:00 · 2025-04-27 11:31:56 +00:00 · 2025-04-27 13:31:54 +02:00
1 changed files with 4 additions and 4 deletions
--- a/include/stack_macros.h
+++ b/include/stack_macros.h
@ -164,9 +164,9 @@
        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                         \
        do                                                                                      \
        {                                                                                       \
-            const uint32_t * const pulStack = ( uint32_t * ) pxCurrentTCB->pxStack;             \
-            const uint32_t ulCheckValue = ( uint32_t ) 0xa5a5a5a5U;                             \
            const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                               \
+            const uint32_t * const pulStack = ( uint32_t * ) pxTCB->pxStack;                    \
+            const uint32_t ulCheckValue = ( uint32_t ) 0xa5a5a5a5U;                             \
                                                                                                \
            if( ( pxTCB->pxTopOfStack <= pxTCB->pxStack + portSTACK_LIMIT_PADDING ) ||          \
                ( pulStack[ 0 ] != ulCheckValue ) ||                                            \
@ -213,13 +213,13 @@
        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                                                                       \
        do                                                                                                                                    \
        {                                                                                                                                     \
-            int8_t * pcEndOfStack = ( int8_t * ) pxCurrentTCB->pxEndOfStack;                                                                  \
+            const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                                                                             \
+            int8_t * pcEndOfStack = ( int8_t * ) pxTCB->pxEndOfStack;                                                                         \
            static const uint8_t ucExpectedStackBytes[] = { tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE,   \
                                                            tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE,   \
                                                            tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE,   \
                                                            tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE,   \
                                                            tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE, tskSTACK_FILL_BYTE }; \
-            const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                                                                             \
                                                                                                                                              \
            pcEndOfStack -= sizeof( ucExpectedStackBytes );                                                                                   \
                                                                                                                                              \
Author	SHA1	Message	Date
Matth9814	051e252610	Merge `d569fb9f7c` into `4ee6a1f22f`	2025-04-27 11:31:56 +00:00
Matth9814	d569fb9f7c	Remove access to pxCurrentTCB when configCHECK_FOR_STACK_OVERFLOW == 2 Co-authored-by: Jeff Tenney <jeff.tenney@gmail.com>	2025-04-27 13:31:54 +02:00