update macros and introduce __IRQ_SAFE

GorgonMeducer · Mar 24, 2021 · ed90b5b · ed90b5b
1 parent c9a0f16
commit ed90b5b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 35 deletions.
diff --git a/example/app_platform/app_platform.c b/example/app_platform/app_platform.c
@@ -95,7 +95,7 @@ volatile static int32_t s_nCycleCounts = 0;
  */
 void start_counter(void)
 {
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         s_nCycleCounts =  (int32_t)SysTick->VAL - (int32_t)SysTick->LOAD;
     }
 }
@@ -110,7 +110,7 @@ static ALWAYS_INLINE void counter_overflow(void)
  */
 int32_t stop_counter(void)
 {
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         s_nCycleCounts += (int32_t)SysTick->LOAD - (int32_t)SysTick->VAL;
     }
     return s_nCycleCounts;

diff --git a/example/build/mdk/Blinky.uvoptx b/example/build/mdk/Blinky.uvoptx
@@ -312,7 +312,7 @@
       <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\sources\gmsi\utilities\arm\signal.c</PathWithFileName>
@@ -324,7 +324,7 @@
       <GroupNumber>3</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\sources\gmsi\gmsi.c</PathWithFileName>

diff --git a/sources/gmsi/service/memory/stream2block/stream2block.h b/sources/gmsi/service/memory/stream2block/stream2block.h
@@ -204,7 +204,7 @@
                 BLOCK.Size.Get(ref_obj_as((*ptBlock), block_t));                \
             s_t##__NAME##StreamOutService.hwIndex = 0;                          \
                                                                                 \
-            SAFE_ATOM_CODE(){                                                   \
+            __IRQ_SAFE {                                                        \
                 __NAME##_serial_port_enable_tx_cpl_interrupt();                 \
                                                                                 \
                 __NAME##_serial_port_fill_byte(                                 \

diff --git a/sources/gmsi/service/scheduler/scheduler.c b/sources/gmsi/service/scheduler/scheduler.c
@@ -460,7 +460,7 @@ bool scheduler( void )
             return false;
         }       
     )*/
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         pTask = get_task_from_queue(s_TaskQueuePool);
     }
     if (NULL == pTask) {
@@ -519,7 +519,7 @@ bool scheduler( void )
                     }
                 )
                 */
-                SAFE_ATOM_CODE(){
+                __IRQ_SAFE {
                     if (pTask->ptFlag->bSignal) {
                         //! signal already set
                         pTask->bThreadBlocked = false;
@@ -614,7 +614,7 @@ void set_event(event_t *pEvent)
 
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         //! wake up blocked tasks
         safe_task_t *pTask = ptEvent->ptHead;
         while(NULL != pTask) {
@@ -683,7 +683,7 @@ void leave_critical_section(critical_section_t *ptCritical)
         }
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         if (!ptEvent->bSignal) {
             //! wake up blocked tasks
             safe_task_t *ptTask = ptEvent->ptHead;
@@ -729,7 +729,7 @@ void reset_event(event_t *pEvent)
         ptEvent->bSignal = false;
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         ptEvent->bSignal = false;
     }
 #endif
@@ -779,7 +779,7 @@ bool wait_for_single_object(fsm_flag_t *ptFlag, void *ptTask)
         }
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         bResult = ptEvent->bSignal;
         if (!ptEvent->bManualReset) {
             ptEvent->bSignal = false;
@@ -854,7 +854,7 @@ static bool _register_task( safe_task_t *pTask )
             bResult = false;   
         } 
     )*/
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         if (!add_task_to_queue(&s_TaskQueuePool[0],pTask)) {
             bResult = false;   
         }

diff --git a/sources/gmsi/service/scheduler/task.c b/sources/gmsi/service/scheduler/task.c
@@ -173,7 +173,7 @@ safe_task_t *new_task( safe_task_func_t *fnRoutine, void *pArg )
         }
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         if (NULL != s_pFreeList) {
             pTask = s_pFreeList;
             s_pFreeList = s_pFreeList->pNext;
@@ -260,7 +260,7 @@ void free_task( safe_task_t *pTask )
         s_pFreeList = pTask;
     )
 #else
-    SAFE_ATOM_CODE(){
+    __IRQ_SAFE {
         pTask->pchKey = NULL;                   //!< clear task key
 
         //! add task item to freelist
@@ -297,7 +297,7 @@ bool task_pool_init(void *pHeap, uint16_t hwSize)
             s_pFreeList = pTask;
         )
 #else
-        SAFE_ATOM_CODE(){
+        __IRQ_SAFE {
             pTask->pchKey = NULL;                   //!< clear task key
 
             //! add task item to freelist

diff --git a/sources/gmsi/utilities/arm/arm_compiler.h b/sources/gmsi/utilities/arm/arm_compiler.h
@@ -105,6 +105,7 @@
  * Warning Mitigation                                                         *
  *----------------------------------------------------------------------------*/
 #if defined(__clang__) //__IS_COMPILER_LLVM__
+#pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
 #pragma clang diagnostic ignored "-Wmissing-declarations"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #pragma clang diagnostic ignored "-Wmicrosoft-anon-tag"

diff --git a/sources/gmsi/utilities/arm/signal.c b/sources/gmsi/utilities/arm/signal.c
@@ -109,7 +109,7 @@ bool enter_lock(locker_t *ptLock)
         return true;
     }
     if (UNLOCKED == (*ptLock)) {
-        SAFE_ATOM_CODE(){
+        __IRQ_SAFE {
             if (UNLOCKED == (*ptLock)) {
                 (*ptLock) = LOCKED;
                 bResult = true;

diff --git a/sources/gmsi/utilities/arm/signal.h b/sources/gmsi/utilities/arm/signal.h
@@ -21,6 +21,7 @@
 /*============================ INCLUDES ======================================*/
 #include <stdbool.h>
 #include <stdint.h>
+#include "../preprocessor/preprocessor.h"
 
 /*! \brief How To Define and Use your own CODE_REGION
  *!        Example:
@@ -205,6 +206,13 @@
             __CODE_REGION_SIMPLE((__REGION_ADDR), __VA_ARGS__)
 
 
+
+#ifndef __IRQ_SAFE
+#   define __IRQ_SAFE                                                           \
+            using(  uint32_t CONNECT2(temp,__LINE__) = __disable_irq(),         \
+                    __set_PRIMASK(CONNECT2(temp,__LINE__)))
+#endif    
+
 /*============================ TYPES =========================================*/
 typedef volatile bool locker_t;
 

diff --git a/sources/gmsi/utilities/preprocessor/language_extension.h b/sources/gmsi/utilities/preprocessor/language_extension.h
@@ -20,7 +20,13 @@
 #define __LANGUAGE_EXTENSION_H__
 
 #include "../3rd-party/PLOOC/plooc.h"
+#include "./connect.h"
 
+#undef __using1
+#undef __using2
+#undef __using3
+#undef __using4
+#undef using
 
 #define __using1(__declare)                                                     \
             for (__declare, *CONNECT3(__using_, __LINE__,_ptr) = NULL;          \
@@ -30,57 +36,57 @@
 #define __using2(__declare, __on_leave_expr)                                    \
             for (__declare, *CONNECT3(__using_, __LINE__,_ptr) = NULL;          \
                  CONNECT3(__using_, __LINE__,_ptr)++ == NULL;                   \
-                 __on_leave_expr                                                \
+                 (__on_leave_expr)                                              \
                 )
 
 #define __using3(__declare, __on_enter_expr, __on_leave_expr)                   \
             for (__declare, *CONNECT3(__using_, __LINE__,_ptr) = NULL;          \
                  CONNECT3(__using_, __LINE__,_ptr)++ == NULL ?                  \
                     ((__on_enter_expr),1) : 0;                                  \
-                 __on_leave_expr                                                \
+                 (__on_leave_expr)                                              \
                 )
 
 #define __using4(__dcl1, __dcl2, __on_enter_expr, __on_leave_expr)              \
             for (__dcl1, __dcl2, *CONNECT3(__using_, __LINE__,_ptr) = NULL;     \
                  CONNECT3(__using_, __LINE__,_ptr)++ == NULL ?                  \
                     ((__on_enter_expr),1) : 0;                                  \
-                 __on_leave_expr                                                \
+                 (__on_leave_expr)                                              \
                 )
 
 #define using(...)                                                              \
             CONNECT2(__using, __PLOOC_VA_NUM_ARGS(__VA_ARGS__))(__VA_ARGS__)
 
+
+#undef __with2
+#undef __with3
+#undef with
+
 #define __with2(__type, __addr)                                                 \
-            using(__type *_p=(__addr))
+            using(__type *_=(__addr))
 #define __with3(__type, __addr, __item)                                         \
-            using(__type *_p=(__addr), *__item = _p, _p=_p, )
+            using(__type *_=(__addr), *__item = _, _=_,_=_ )
 
 #define with(...)                                                               \
             CONNECT2(__with, __PLOOC_VA_NUM_ARGS(__VA_ARGS__))(__VA_ARGS__)
 
-#ifndef dimof
-#   define dimof(__array)          (sizeof(__array)/sizeof(__array[0]))
-#endif
+#undef _
+
+#undef foreach2
+#undef foreach3
+#undef foreach
 
 #define foreach2(__type, __array)                                               \
-            using(__type *_p = __array)                                         \
+            using(__type *_ = __array)                                         \
             for (   uint_fast32_t CONNECT2(count,__LINE__) = dimof(__array);    \
                     CONNECT2(count,__LINE__) > 0;                               \
-                    _p++, CONNECT2(count,__LINE__)--                            \
+                    _++, CONNECT2(count,__LINE__)--                            \
                 )
 
 #define foreach3(__type, __array, __item)                                       \
-            using(__type *_p = __array, *__item = _p, _p = _p, )                \
+            using(__type *_ = __array, *__item = _, _ = _, )                \
             for (   uint_fast32_t CONNECT2(count,__LINE__) = dimof(__array);    \
                     CONNECT2(count,__LINE__) > 0;                               \
-                    _p++, __item = _p, CONNECT2(count,__LINE__)--               \
-                )
-
-#define foreach4(__type, __array, __count, __item)                              \
-            using(__type *_p = __array, *__item = _p, _p = _p, )                \
-            for (   uint_fast32_t CONNECT2(count,__LINE__) = (__count);         \
-                    CONNECT2(count,__LINE__) > 0;                               \
-                    _p++, __item = _p, CONNECT2(count,__LINE__)--               \
+                    _++, __item = _, CONNECT2(count,__LINE__)--               \
                 )
 
 #define foreach(...)                                                            \