Skip to content

Commit 6534df9

Browse files
aggargaggarg
authored
Merge branch 'main' into stack_overflow_check
2 parents c108df4 + 11d0caa commit 6534df9

File tree

27 files changed

+287
-190
lines changed

27 files changed

+287
-190
lines changed

‎.github/workflows/kernel-demos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@ jobs:
268268
fetch-depth: 1
269269

270270
- env:
271-
stepName: Fetch Community-Supported-Demos Submodule
271+
stepName: Fetch Dependencies
272272
shell: bash
273273
run: |
274274
# ${{ env.stepName }}
275275
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
276-
git submodule update --checkout --init --depth 1 FreeRTOS/Demo/ThirdParty/Community-Supported-Demos
276+
git submodule update --checkout --init --depth 1 FreeRTOS/Demo/ThirdParty/Community-Supported-Demos FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace
277277
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
278278
279279
# Checkout user pull request changes

‎portable/ARMv8M/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

‎portable/GCC/ARM_CM23/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

‎portable/GCC/ARM_CM23_NTZ/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

‎portable/GCC/ARM_CM33/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

‎portable/GCC/ARM_CM33_NTZ/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

‎portable/GCC/ARM_CM35P/non_secure/portmacrocommon.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
246246
* +-----------+---------------+----------+-----------------+------------------------------+------------+-----+
247247
*
248248
* <-----------><--------------><---------><----------------><-----------------------------><-----------><---->
249-
* 16 16 8 8 5 16 1
249+
* 16 17 8 8 5 16 1
250250
*/
251-
#define MAX_CONTEXT_SIZE 70
251+
#define MAX_CONTEXT_SIZE 71
252252

253253
#elif ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 0 ) )
254254

@@ -259,9 +259,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
259259
* +-----------+---------------+----------+-----------------+------------------------------+-----+
260260
*
261261
* <-----------><--------------><---------><----------------><-----------------------------><---->
262-
* 16 16 8 8 5 1
262+
* 16 17 8 8 5 1
263263
*/
264-
#define MAX_CONTEXT_SIZE 54
264+
#define MAX_CONTEXT_SIZE 55
265265

266266
#elif ( ( configENABLE_TRUSTZONE == 0 ) && ( configENABLE_PAC == 1 ) )
267267

@@ -272,9 +272,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
272272
* +-----------+---------------+----------+-----------------+----------------------+------------+-----+
273273
*
274274
* <-----------><--------------><---------><----------------><---------------------><-----------><---->
275-
* 16 16 8 8 4 16 1
275+
* 16 17 8 8 4 16 1
276276
*/
277-
#define MAX_CONTEXT_SIZE 69
277+
#define MAX_CONTEXT_SIZE 70
278278

279279
#else /* if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
280280

@@ -285,9 +285,9 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
285285
* +-----------+---------------+----------+-----------------+----------------------+-----+
286286
*
287287
* <-----------><--------------><---------><----------------><---------------------><---->
288-
* 16 16 8 8 4 1
288+
* 16 17 8 8 4 1
289289
*/
290-
#define MAX_CONTEXT_SIZE 53
290+
#define MAX_CONTEXT_SIZE 54
291291

292292
#endif /* #if ( ( configENABLE_TRUSTZONE == 1 ) && ( configENABLE_PAC == 1 ) ) */
293293

0 commit comments

Comments
 (0)