summaryrefslogtreecommitdiff
path: root/ports/arc_hs
diff options
context:
space:
mode:
authorTiejun Zhou <[email protected]>2023-03-08 08:26:22 +0000
committerTiejun Zhou <[email protected]>2023-03-08 08:26:22 +0000
commit2aa19f3de0b6cf09bb9dca78c8a53fe337b8f0f7 (patch)
tree8ec91a64e0831e3100a6ad9a5dec41d9fd7fc74f /ports/arc_hs
parent745395d6a2f931c85c4428425db21eb7d03b4324 (diff)
Release 6.2.1 on 08 Mar 2023. Expand to see details.v6.2.1_rel
cee19603d Include tx_user.h conditionally. e40e08007 Update owners d69641273 Update release date and version 394aee52f Add tx_user.h to GNU port assembly files 5cca2ddd0 RISC-V 64 bit port for Microchip e0f2c373c Link Winmm.lib that required by the high-resolution timer. 6af472a68 Update Win32 port with high resolution timer. aea7b556a Add DMB ISH barrier inst in ARMv8-A SMP scheduler 19091a262 Add .section .preamble to m3 m4 m7 module ports ced60e1b7 Add missing parenthesis in ports assembly file 309dc77ca Modules Cortex-A7 IAR new port c752a4063 Modules Cortex-A7 GNU new port dc224b90f Fix race condition in tx_thread_wait_abort and update regression test 6e261f5b7 create threadx cmsis-pack
Diffstat (limited to 'ports/arc_hs')
-rw-r--r--ports/arc_hs/metaware/inc/tx_port.h2
-rw-r--r--ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s20
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s24
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_context_fast_save.s21
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_context_restore.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_context_save.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_interrupt_control.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_register_bank_assign.s20
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_schedule.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_stack_build.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_thread_system_return.s8
-rw-r--r--ports/arc_hs/metaware/src/tx_timer_interrupt.s8
12 files changed, 84 insertions, 59 deletions
diff --git a/ports/arc_hs/metaware/inc/tx_port.h b/ports/arc_hs/metaware/inc/tx_port.h
index 5d61c45c..4c38652a 100644
--- a/ports/arc_hs/metaware/inc/tx_port.h
+++ b/ports/arc_hs/metaware/inc/tx_port.h
@@ -336,7 +336,7 @@ VOID tx_thread_register_bank_assign(VOID *thread_ptr, UINT register_bank);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARC_HS/MetaWare Version 6.1.10 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARC_HS/MetaWare Version 6.2.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
diff --git a/ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s b/ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s
index 7a2c8549..b3375746 100644
--- a/ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s
+++ b/ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s
@@ -19,23 +19,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
-;
-;
-;#define TX_SOURCE_CODE
-;
-;
-;/* Include necessary system files. */
-;
-;#include "tx_api.h"
-;#include "tx_initialize.h"
-;
-;
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_initialize_fast_interrupt_setup ARC_HS/MetaWare */
-;/* 6.1 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -67,6 +60,9 @@
;/* DATE NAME DESCRIPTION */
;/* */
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_initialize_fast_interrupt_setup(VOID *stack_ptr)
diff --git a/ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s b/ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s
index 1181d9e3..c5345f24 100644
--- a/ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s
+++ b/ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s
@@ -19,25 +19,18 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
-;
-;
-;#define TX_SOURCE_CODE
-;
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.equ BTA, 0x412
-;
-;/* Include necessary system files. */
-;
-;#include "tx_api.h"
-;#include "tx_thread.h"
-;#include "tx_timer.h"
-;
-;
+
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_fast_restore ARC_HS/MetaWare */
-;/* 6.1 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -70,6 +63,9 @@
;/* DATE NAME DESCRIPTION */
;/* */
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_fast_restore(VOID)
@@ -115,7 +111,7 @@ __tx_thread_nested_restore:
__tx_thread_not_nested_restore:
;
; /* Determine if a thread was interrupted and no preemption is required. */
-; else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr)
+; else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr))
; || (_tx_thread_preempt_disable))
; {
;
diff --git a/ports/arc_hs/metaware/src/tx_thread_context_fast_save.s b/ports/arc_hs/metaware/src/tx_thread_context_fast_save.s
index ceb1cb44..9cce0879 100644
--- a/ports/arc_hs/metaware/src/tx_thread_context_fast_save.s
+++ b/ports/arc_hs/metaware/src/tx_thread_context_fast_save.s
@@ -19,24 +19,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
-;
-;
-;#define TX_SOURCE_CODE
-;
-;
-;/* Include necessary system files. */
-;
-;#include "tx_api.h"
-;#include "tx_thread.h"
-;#include "tx_timer.h"
-;
-;
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_fast_save ARC_HS/MetaWare */
-;/* 6.1 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -73,6 +65,9 @@
;/* DATE NAME DESCRIPTION */
;/* */
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_fast_save(VOID)
diff --git a/ports/arc_hs/metaware/src/tx_thread_context_restore.s b/ports/arc_hs/metaware/src/tx_thread_context_restore.s
index f7ce8f10..8f22684b 100644
--- a/ports/arc_hs/metaware/src/tx_thread_context_restore.s
+++ b/ports/arc_hs/metaware/src/tx_thread_context_restore.s
@@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.equ BTA, 0x412
@@ -26,7 +29,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_restore ARC_HS/MetaWare */
-;/* 6.1.9 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -63,6 +66,9 @@
;/* r25/r30 are caller saved, */
;/* use schedule_reenter, */
;/* resulting in version 6.1.9 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_restore(VOID)
diff --git a/ports/arc_hs/metaware/src/tx_thread_context_save.s b/ports/arc_hs/metaware/src/tx_thread_context_save.s
index eaebbe13..654928c1 100644
--- a/ports/arc_hs/metaware/src/tx_thread_context_save.s
+++ b/ports/arc_hs/metaware/src/tx_thread_context_save.s
@@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.equ BTA, 0x412
@@ -26,7 +29,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_save ARC_HS/MetaWare */
-;/* 6.1.9 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +64,9 @@
;/* 10-15-2021 Andres Mlinar Modified comment(s), and */
;/* r25/r30 are caller saved, */
;/* resulting in version 6.1.9 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_save(VOID)
diff --git a/ports/arc_hs/metaware/src/tx_thread_interrupt_control.s b/ports/arc_hs/metaware/src/tx_thread_interrupt_control.s
index 6e1adb89..10bf1d62 100644
--- a/ports/arc_hs/metaware/src/tx_thread_interrupt_control.s
+++ b/ports/arc_hs/metaware/src/tx_thread_interrupt_control.s
@@ -18,13 +18,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_interrupt_control ARC_HS/MetaWare */
-;/* 6.1.6 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -57,6 +60,9 @@
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
;/* 04-02-2021 Andres Mlinar Modified comments, */
;/* resulting in version 6.1.6 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;UINT _tx_thread_interrupt_control(UINT new_posture)
diff --git a/ports/arc_hs/metaware/src/tx_thread_register_bank_assign.s b/ports/arc_hs/metaware/src/tx_thread_register_bank_assign.s
index 560afc7f..4082fd6e 100644
--- a/ports/arc_hs/metaware/src/tx_thread_register_bank_assign.s
+++ b/ports/arc_hs/metaware/src/tx_thread_register_bank_assign.s
@@ -19,23 +19,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
-;
-;
-;#define TX_SOURCE_CODE
-;
-;
-;/* Include necessary system files. */
-;
-;#include "tx_api.h"
-;#include "tx_thread.h"
-;
-;
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_register_bank_assign ARC_HS/MetaWare */
-;/* 6.1 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -69,6 +62,9 @@
;/* DATE NAME DESCRIPTION */
;/* */
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_register_bank_assign(VOID *thread_ptr, UINT register_bank)
diff --git a/ports/arc_hs/metaware/src/tx_thread_schedule.s b/ports/arc_hs/metaware/src/tx_thread_schedule.s
index c5633c71..3291cb8a 100644
--- a/ports/arc_hs/metaware/src/tx_thread_schedule.s
+++ b/ports/arc_hs/metaware/src/tx_thread_schedule.s
@@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.equ BTA, 0x412
@@ -26,7 +29,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_schedule ARC_HS/MetaWare */
-;/* 6.1.9 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -63,6 +66,9 @@
;/* 10-15-2021 Andres Mlinar Modified comment(s), */
;/* use schedule reenter, */
;/* resulting in version 6.1.9 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_schedule(VOID)
diff --git a/ports/arc_hs/metaware/src/tx_thread_stack_build.s b/ports/arc_hs/metaware/src/tx_thread_stack_build.s
index a0564577..225cdd62 100644
--- a/ports/arc_hs/metaware/src/tx_thread_stack_build.s
+++ b/ports/arc_hs/metaware/src/tx_thread_stack_build.s
@@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.equ LONG_ALIGN_MASK, 0xFFFFFFFC
.equ INT_ENABLE_BITS, 0x8000001E
@@ -27,7 +30,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_stack_build ARC_HS/MetaWare */
-;/* 6.1.6 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -62,6 +65,9 @@
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
;/* 04-02-2021 Andres Mlinar Modified comments, */
;/* resulting in version 6.1.6 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID))
diff --git a/ports/arc_hs/metaware/src/tx_thread_system_return.s b/ports/arc_hs/metaware/src/tx_thread_system_return.s
index 25642499..affd3b54 100644
--- a/ports/arc_hs/metaware/src/tx_thread_system_return.s
+++ b/ports/arc_hs/metaware/src/tx_thread_system_return.s
@@ -18,13 +18,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_system_return ARC_HS/MetaWare */
-;/* 6.1.9 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -60,6 +63,9 @@
;/* 10-15-2021 Andres Mlinar Modified comments, */
;/* use schedule reenter, */
;/* resulting in version 6.1.9 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_system_return(VOID)
diff --git a/ports/arc_hs/metaware/src/tx_timer_interrupt.s b/ports/arc_hs/metaware/src/tx_timer_interrupt.s
index 1ae05e76..959281f4 100644
--- a/ports/arc_hs/metaware/src/tx_timer_interrupt.s
+++ b/ports/arc_hs/metaware/src/tx_timer_interrupt.s
@@ -18,13 +18,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_timer_interrupt ARC_HS/MetaWare */
-;/* 6.1.9 */
+;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -69,6 +72,9 @@
;/* fixed possible race */
;/* condition on preemption */
;/* resulting in version 6.1.9 */
+;/* 03-08-2023 Cindy Deng Modified comment(s), added */
+;/* #include tx_user.h, */
+;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_timer_interrupt(VOID)