Merge branch "preempt" in "trunk".

[bertos.git] / bertos / cpu / attr.h

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index c6d8373484d300c7f3c6deded36c9ff993da9629..832f0618698c724945f7196dfaf97e30cf790404 100644 (file)
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -42,6 +42,7 @@
 
 #include "detect.h"
 
+#include "cfg/cfg_proc.h"      /* CONFIG_KERN_PREEMPT */
 #include "cfg/cfg_attr.h"      /* CONFIG_FAST_MEM */
 
 
@@ -94,6 +95,8 @@
 
        #ifdef __GNUC__
                #define NOP         asm volatile ("nop")
+               /* This is a good thing to insert into busy-wait loops. */
+               #define PAUSE       asm volatile ("rep; nop" ::: "memory")
                #define BREAKPOINT  asm volatile ("int3" ::)
        #endif
 
@@ -153,11 +156,6 @@
                        #define FAST_FUNC /**/
                #endif
 
-               /**
-                * Function attribute to declare an interrupt service routine.
-                */
-               #define ISR_FUNC __attribute__((interrupt))
-
                /*
                 * Function attribute to move it into ram memory.
                 */
@@ -239,4 +237,9 @@
        #define FAST_RODATA /* */
 #endif
 
+#ifndef PAUSE
+       /// Generic PAUSE implementation.
+       #define PAUSE   {NOP; MEMORY_BARRIER;}
+#endif
+
 #endif /* CPU_ATTR_H */