Skip to content

Commit 4e62226

Browse files
author
Scott Larson
committed
Update on 16 Dec 2022. Expand to see details.
b5d5df511 #include tx_user.h in assembly files for cortex-m ports 33e04e3d5 initial port of MIPS SMP for GHS and GNU 2eda2c17d capitalize extensions for M23 asm files 21c354ccb Fix armv7-m MPU settings for corner case, unify txm_module_port.h files 4a1ff93f9 remove uneeded include for ac6 c823e91ff update riscv iar example for latest iar tools 5559d185d check module stack for overlap (not kernel stack) efa9ce7b7 apply patch from mobileye to fix time slice processing 75fdcb722 Updated copy_armv7_cm.yml de04b9904 initialize unused MPU settings so that aliasing will work 79b317b60 add config directory to IAR RISC-V port in order to use simulator
1 parent b42c5ac commit 4e62226

File tree

148 files changed

+21660
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+21660
-50
lines changed

‎common_modules/module_manager/src/txm_module_manager_thread_create.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/* FUNCTION RELEASE */
4040
/* */
4141
/* _txm_module_manager_thread_create PORTABLE C */
42-
/* 6.1.3 */
42+
/* 6.x */
4343
/* AUTHOR */
4444
/* */
4545
/* Scott Larson, Microsoft Corporation */
@@ -91,6 +91,9 @@
9191
/* added 64-bit support, */
9292
/* added SMP support, */
9393
/* resulting in version 6.1.3 */
94+
/* xx-xx-xxxx Scott Larson Check module stack for */
95+
/* overlap, */
96+
/* resulting in version 6.x */
9497
/* */
9598
/**************************************************************************/
9699
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
@@ -158,8 +161,8 @@ ULONG i;
158161
}
159162

160163
/* Check the stack pointer to see if it overlaps with this thread's stack. */
161-
if ((((UCHAR *) ((VOID *) stack_start)) <= ((UCHAR *) ((VOID *) next_thread -> tx_thread_stack_end))) &&
162-
(((UCHAR *) ((VOID *) stack_end)) >= ((UCHAR *) ((VOID *) next_thread -> tx_thread_stack_start))))
164+
if ((((UCHAR *) ((VOID *) stack_start)) <= ((UCHAR *) ((VOID *) next_thread -> tx_thread_module_stack_end))) &&
165+
(((UCHAR *) ((VOID *) stack_end)) >= ((UCHAR *) ((VOID *) next_thread -> tx_thread_module_stack_start))))
163166
{
164167
/* Stacks overlap, clear the stack pointer to force a stack error below. */
165168
stack_start = TX_NULL;

‎ports/cortex_m0/ac6/src/tx_thread_context_restore.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222
@
23+
#include "tx_user.h"
2324
@
2425
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
2526
.global _tx_execution_isr_exit
@@ -41,7 +42,7 @@
4142
@/* FUNCTION RELEASE */
4243
@/* */
4344
@/* _tx_thread_context_restore Cortex-M0/AC6 */
44-
@/* 6.1 */
45+
@/* 6.x */
4546
@/* AUTHOR */
4647
@/* */
4748
@/* William E. Lamie, Microsoft Corporation */
@@ -76,6 +77,8 @@
7677
@/* DATE NAME DESCRIPTION */
7778
@/* */
7879
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
80+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
81+
@/* resulting in version 6.x */
7982
@/* */
8083
@/**************************************************************************/
8184
@VOID _tx_thread_context_restore(VOID)

‎ports/cortex_m0/ac6/src/tx_thread_context_save.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222
@
23+
#include "tx_user.h"
2324
@
2425
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
2526
.global _tx_execution_isr_enter
@@ -36,7 +37,7 @@
3637
@/* FUNCTION RELEASE */
3738
@/* */
3839
@/* _tx_thread_context_save Cortex-M0/AC6 */
39-
@/* 6.1 */
40+
@/* 6.x */
4041
@/* AUTHOR */
4142
@/* */
4243
@/* William E. Lamie, Microsoft Corporation */
@@ -70,6 +71,8 @@
7071
@/* DATE NAME DESCRIPTION */
7172
@/* */
7273
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
74+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
75+
@/* resulting in version 6.x */
7376
@/* */
7477
@/**************************************************************************/
7578
@VOID _tx_thread_context_save(VOID)

‎ports/cortex_m0/ac6/src/tx_thread_interrupt_control.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222

23+
#include "tx_user.h"
2324

2425
.text 32
2526
.align 4
@@ -30,7 +31,7 @@
3031
@/* FUNCTION RELEASE */
3132
@/* */
3233
@/* _tx_thread_interrupt_control Cortex-M0/AC6 */
33-
@/* 6.1 */
34+
@/* 6.x */
3435
@/* AUTHOR */
3536
@/* */
3637
@/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +62,8 @@
6162
@/* DATE NAME DESCRIPTION */
6263
@/* */
6364
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
65+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
66+
@/* resulting in version 6.x */
6467
@/* */
6568
@/**************************************************************************/
6669
@/* UINT _tx_thread_interrupt_control(UINT new_posture)

‎ports/cortex_m0/ac6/src/tx_thread_interrupt_disable.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222

23+
#include "tx_user.h"
2324

2425
.text 32
2526
.align 4
@@ -30,7 +31,7 @@
3031
@/* FUNCTION RELEASE */
3132
@/* */
3233
@/* _tx_thread_interrupt_disable Cortex-M0/AC6 */
33-
@/* 6.1 */
34+
@/* 6.x */
3435
@/* AUTHOR */
3536
@/* */
3637
@/* William E. Lamie, Microsoft Corporation */
@@ -60,6 +61,8 @@
6061
@/* DATE NAME DESCRIPTION */
6162
@/* */
6263
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
64+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
65+
@/* resulting in version 6.x */
6366
@/* */
6467
@/**************************************************************************/
6568
@/* UINT _tx_thread_interrupt_disable(VOID)

‎ports/cortex_m0/ac6/src/tx_thread_interrupt_restore.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222

23+
#include "tx_user.h"
2324

2425
.text 32
2526
.align 4
@@ -30,7 +31,7 @@
3031
@/* FUNCTION RELEASE */
3132
@/* */
3233
@/* _tx_thread_interrupt_restore Cortex-M0/AC6 */
33-
@/* 6.1 */
34+
@/* 6.x */
3435
@/* AUTHOR */
3536
@/* */
3637
@/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +62,8 @@
6162
@/* DATE NAME DESCRIPTION */
6263
@/* */
6364
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
65+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
66+
@/* resulting in version 6.x */
6467
@/* */
6568
@/**************************************************************************/
6669
@/* VOID _tx_thread_interrupt_restore(UINT old_posture)

‎ports/cortex_m0/ac6/src/tx_thread_schedule.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222
@
23+
#include "tx_user.h"
2324
@
2425
.global _tx_thread_current_ptr
2526
.global _tx_thread_execute_ptr
@@ -43,7 +44,7 @@
4344
@/* FUNCTION RELEASE */
4445
@/* */
4546
@/* _tx_thread_schedule Cortex-M0/AC6 */
46-
@/* 6.1.5 */
47+
@/* 6.x */
4748
@/* AUTHOR */
4849
@/* */
4950
@/* William E. Lamie, Microsoft Corporation */
@@ -80,6 +81,8 @@
8081
@/* 03-02-2021 Scott Larson Modified comment(s), add */
8182
@/* low power code, */
8283
@/* resulting in version 6.1.5 */
84+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
85+
@/* resulting in version 6.x */
8386
@/* */
8487
@/**************************************************************************/
8588
@VOID _tx_thread_schedule(VOID)

‎ports/cortex_m0/ac6/src/tx_thread_stack_build.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222
@
23+
#include "tx_user.h"
2324
@
2425
.text
2526
.align 4
@@ -29,7 +30,7 @@
2930
@/* FUNCTION RELEASE */
3031
@/* */
3132
@/* _tx_thread_stack_build Cortex-M0/AC6 */
32-
@/* 6.1 */
33+
@/* 6.x */
3334
@/* AUTHOR */
3435
@/* */
3536
@/* William E. Lamie, Microsoft Corporation */
@@ -62,6 +63,8 @@
6263
@/* DATE NAME DESCRIPTION */
6364
@/* */
6465
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
66+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
67+
@/* resulting in version 6.x */
6568
@/* */
6669
@/**************************************************************************/
6770
@VOID _tx_thread_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID))

‎ports/cortex_m0/ac6/src/tx_thread_system_return.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222

23+
#include "tx_user.h"
2324

2425
.text
2526
.align 4
@@ -29,7 +30,7 @@
2930
@/* FUNCTION RELEASE */
3031
@/* */
3132
@/* _tx_thread_system_return Cortex-M0/AC6 */
32-
@/* 6.1 */
33+
@/* 6.x */
3334
@/* AUTHOR */
3435
@/* */
3536
@/* William E. Lamie, Microsoft Corporation */
@@ -62,6 +63,8 @@
6263
@/* DATE NAME DESCRIPTION */
6364
@/* */
6465
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
66+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
67+
@/* resulting in version 6.x */
6568
@/* */
6669
@/**************************************************************************/
6770
@/* VOID _tx_thread_system_return(VOID)

‎ports/cortex_m0/ac6/src/tx_timer_interrupt.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@/**************************************************************************/
2121
@/**************************************************************************/
2222
@
23+
#include "tx_user.h"
2324
@
2425
.global _tx_timer_time_slice
2526
.global _tx_timer_system_clock
@@ -40,7 +41,7 @@
4041
@/* FUNCTION RELEASE */
4142
@/* */
4243
@/* _tx_timer_interrupt Cortex-M0/AC6 */
43-
@/* 6.1 */
44+
@/* 6.x */
4445
@/* AUTHOR */
4546
@/* */
4647
@/* William E. Lamie, Microsoft Corporation */
@@ -75,6 +76,8 @@
7576
@/* DATE NAME DESCRIPTION */
7677
@/* */
7778
@/* 09-30-2020 William E. Lamie Initial Version 6.1 */
79+
@/* xx-xx-xxxx Scott Larson Include tx_user.h, */
80+
@/* resulting in version 6.x */
7881
@/* */
7982
@/**************************************************************************/
8083
@VOID _tx_timer_interrupt(VOID)

0 commit comments

Comments
 (0)