summaryrefslogtreecommitdiff
path: root/common/src/tx_thread_stack_error_handler.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/tx_thread_stack_error_handler.c')
-rw-r--r--common/src/tx_thread_stack_error_handler.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/common/src/tx_thread_stack_error_handler.c b/common/src/tx_thread_stack_error_handler.c
index 9049b338..e1966617 100644
--- a/common/src/tx_thread_stack_error_handler.c
+++ b/common/src/tx_thread_stack_error_handler.c
@@ -26,8 +26,7 @@
/* Include necessary system files. */
#include "tx_api.h"
-#ifndef TX_PORT_THREAD_STACK_ERROR_HANDLER
-#if defined(TX_MISRA_ENABLE) || defined(TX_ENABLE_STACK_CHECKING)
+#if defined(TX_MISRA_ENABLE) || defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
#include "tx_thread.h"
@@ -36,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _tx_thread_stack_error_handler PORTABLE C */
-/* 6.1.7 */
+/* 6.1.9 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
@@ -78,6 +77,9 @@
/* conditional compilation */
/* for ARMv8-M (Cortex M23/33) */
/* resulting in version 6.1.7 */
+/* 10-15-2021 Yuxin Zhou Modified comment(s), improved */
+/* stack check error handling, */
+/* resulting in version 6.1.9 */
/* */
/**************************************************************************/
VOID _tx_thread_stack_error_handler(TX_THREAD *thread_ptr)
@@ -85,7 +87,7 @@ VOID _tx_thread_stack_error_handler(TX_THREAD *thread_ptr)
TX_INTERRUPT_SAVE_AREA
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
/* Disable interrupts. */
TX_DISABLE
@@ -109,12 +111,10 @@ TX_INTERRUPT_SAVE_AREA
/* Disable interrupts. */
TX_DISABLE
-
+
/* Restore interrupts. */
TX_RESTORE
}
#endif
}
-#endif /* TX_MISRA_ENABLE */
-
-#endif /* TX_PORT_THREAD_STACK_ERROR_HANDLER */
+#endif