From f1132d05aecfdf6e43624eba7e112c1dec84d74e Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Wed, 30 Apr 2025 06:13:44 +0000 Subject: [PATCH 1/3] Fix CI formatting check Signed-off-by: Gaurav Aggarwal --- include/stack_macros.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/stack_macros.h b/include/stack_macros.h index 41490a24b..9b481241b 100644 --- a/include/stack_macros.h +++ b/include/stack_macros.h @@ -68,8 +68,8 @@ #if ( configNUMBER_OF_CORES == 1 ) - /* Only the current stack state is to be checked. */ - #define taskCHECK_FOR_STACK_OVERFLOW() \ +/* Only the current stack state is to be checked. */ + #define taskCHECK_FOR_STACK_OVERFLOW() \ do \ { \ /* Is the currently saved stack pointer within the stack limit? */ \ @@ -80,10 +80,10 @@ } \ } while( 0 ) - #else /* if ( configNUMBER_OF_CORES == 1 ) */ + #else /* if ( configNUMBER_OF_CORES == 1 ) */ - /* Only the current stack state is to be checked. */ - #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ +/* Only the current stack state is to be checked. */ + #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ @@ -105,8 +105,8 @@ #if ( configNUMBER_OF_CORES == 1 ) - /* Only the current stack state is to be checked. */ - #define taskCHECK_FOR_STACK_OVERFLOW() \ +/* Only the current stack state is to be checked. */ + #define taskCHECK_FOR_STACK_OVERFLOW() \ do \ { \ /* Is the currently saved stack pointer within the stack limit? */ \ @@ -117,10 +117,10 @@ } \ } while( 0 ) - #else /* if ( configNUMBER_OF_CORES == 1 ) */ + #else /* if ( configNUMBER_OF_CORES == 1 ) */ - /* Only the current stack state is to be checked. */ - #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ +/* Only the current stack state is to be checked. */ + #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ @@ -142,7 +142,7 @@ #if ( configNUMBER_OF_CORES == 1 ) - #define taskCHECK_FOR_STACK_OVERFLOW() \ + #define taskCHECK_FOR_STACK_OVERFLOW() \ do \ { \ const uint32_t * const pulStack = ( uint32_t * ) pxCurrentTCB->pxStack; \ @@ -159,9 +159,9 @@ } \ } while( 0 ) - #else /* if ( configNUMBER_OF_CORES == 1 ) */ + #else /* if ( configNUMBER_OF_CORES == 1 ) */ - #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ + #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ @@ -188,7 +188,7 @@ #if ( configNUMBER_OF_CORES == 1 ) - #define taskCHECK_FOR_STACK_OVERFLOW() \ + #define taskCHECK_FOR_STACK_OVERFLOW() \ do \ { \ int8_t * pcEndOfStack = ( int8_t * ) pxCurrentTCB->pxEndOfStack; \ @@ -208,9 +208,9 @@ } \ } while( 0 ) - #else /* if ( configNUMBER_OF_CORES == 1 ) */ + #else /* if ( configNUMBER_OF_CORES == 1 ) */ - #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ + #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ From 90d8db53c2bea3748b7e6e25073309f74d941341 Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Wed, 30 Apr 2025 06:38:15 +0000 Subject: [PATCH 2/3] Fix build check Signed-off-by: Gaurav Aggarwal --- include/stack_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/stack_macros.h b/include/stack_macros.h index 9b481241b..77e86cb78 100644 --- a/include/stack_macros.h +++ b/include/stack_macros.h @@ -86,7 +86,7 @@ #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ - const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ + TCB_t * pxTCB = pxCurrentTCBs[ xCoreID ]; \ \ /* Is the currently saved stack pointer within the stack limit? */ \ if( pxTCB->pxTopOfStack <= pxTCB->pxStack + portSTACK_LIMIT_PADDING ) \ @@ -123,7 +123,7 @@ #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ - const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ + TCB_t * pxTCB = pxCurrentTCBs[ xCoreID ]; \ \ /* Is the currently saved stack pointer within the stack limit? */ \ if( pxTCB->pxTopOfStack >= pxTCB->pxEndOfStack - portSTACK_LIMIT_PADDING ) \ @@ -164,7 +164,7 @@ #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ - const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ + TCB_t * pxTCB = pxCurrentTCBs[ xCoreID ]; \ const uint32_t * const pulStack = ( uint32_t * ) pxTCB->pxStack; \ const uint32_t ulCheckValue = ( uint32_t ) 0xa5a5a5a5U; \ \ @@ -213,7 +213,7 @@ #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) \ do \ { \ - const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ]; \ + TCB_t * 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, \ From b35769711023e057a02a21c458a71918098b354c Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Wed, 30 Apr 2025 07:21:23 +0000 Subject: [PATCH 3/3] Fix tests Signed-off-by: Gaurav Aggarwal --- include/stack_macros.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/stack_macros.h b/include/stack_macros.h index 77e86cb78..8bf0720c9 100644 --- a/include/stack_macros.h +++ b/include/stack_macros.h @@ -238,7 +238,11 @@ /* Remove stack overflow macro if not being used. */ #ifndef taskCHECK_FOR_STACK_OVERFLOW - #define taskCHECK_FOR_STACK_OVERFLOW() + #if ( configNUMBER_OF_CORES == 1 ) + #define taskCHECK_FOR_STACK_OVERFLOW() + #else + #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID ) + #endif #endif