Move unpack lwip ip address macro to macros module.

[bertos.git] / bertos / cfg / compiler.h

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index e8a76ab1af9e3fddb5af5bf8a753ab00fb670315..0d401bcc42e27ba14997b4f1f8b73682050aad3b 100644 (file)
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -54,10 +54,14 @@
        #pragma c99 on
 #endif
 
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-       #define COMPILER_C99      1
-#else
-       #define COMPILER_C99      0
+#if defined(__STDC_VERSION__)
+    #if (__STDC_VERSION__ == 199409L) // IAR
+           #define COMPILER_C99      1  // not true, because partial C99, avoid miscompilation
+    #elif (__STDC_VERSION__ >= 199901L) // GCC
+           #define COMPILER_C99      1
+    #else
+           #define COMPILER_C99      0
+    #endif
 #endif
 
 
@@ -105,12 +109,20 @@
 
        #pragma language=extended
 
-       #if CPU_ARM
+       /* IAR iccarm specific functions */
+       #include <intrinsics.h>
+       #pragma diag_suppress=Pe940
+       #pragma inline = forced
+
+       #define MEMORY_BARRIER          asm("")
+
+       #if CPU_ARM || CPU_CM3
 
                #define COMPILER_VARIADIC_MACROS 1
 
                #define INTERRUPT(x)  __irq __arm void x (void)
                #define INLINE        static inline
+               #define NAKED
 
                /* Include some standard C89/C99 stuff */
                #include <stddef.h>
@@ -209,6 +221,7 @@
        #define RESTRICT                __restrict__
        #define MUST_CHECK              __attribute__((warn_unused_result))
        #define PACKED                  __attribute__((packed))
+       #define ALIGNED(x)              __attribute__ ((__aligned__(x)))
        #if CPU_ARM | CPU_CM3
                #define NAKED           __attribute__((naked))
        #else
@@ -216,7 +229,7 @@
        #endif
 
        /**
-        * Force compiler to realod context variable.
+        * Force compiler to reload context variable.
         */
        #define MEMORY_BARRIER           asm volatile ("" : : : "memory")
 
@@ -360,6 +373,9 @@
 #ifndef PACKED
 #define PACKED                 /* nothing */
 #endif
+#ifndef ALIGNED
+#define ALIGNED                /* nothing */
+#endif
 #ifndef MEMORY_BARRIER
 #define MEMORY_BARRIER         /* nothing */
 #warning No memory barrier defined for select compiler. If you use the kernel check it.
@@ -446,6 +462,9 @@
        #endif
 #endif
 
+/** User defined callback type */
+typedef void (*Hook)(void *);
+
 /** Bulk storage large enough for both pointers or integers. */
 typedef void * iptr_t;
 
@@ -455,6 +474,14 @@ typedef const void * const_iptr_t;
 typedef unsigned char sigbit_t;  /**< Type for signal bits. */
 typedef unsigned char sigmask_t; /**< Type for signal masks. */
 
+/**
+ * Signal structure
+ */
+typedef struct Signal
+{
+       sigmask_t    wait;    /**< Signals the process is waiting for */
+       sigmask_t    recv;    /**< Received signals */
+} Signal;
 
 /**
  * \name Standard type definitions.
@@ -540,10 +567,10 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
                 * NOTE: the construct __builtin_types_compatible_p() is only
                 * available for C.
                 */
-               #define countof(a) (sizeof(a) / sizeof(*(a)) + \
-                       sizeof(typeof(int[1 - 2 * \
-                               !!__builtin_types_compatible_p(typeof(a), \
-                                               typeof(&a[0]))])) * 0)
+               #define countof(a) (sizeof(a) / sizeof(*(a)) +          \
+                               STATIC_ASSERT_EXPR(                     \
+                                       !__builtin_types_compatible_p(  \
+                                               typeof(a), typeof(&a[0]))))
        #else
                #define countof(a)  (sizeof(a) / sizeof(*(a)))
        #endif
@@ -580,6 +607,13 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 #define STATIC_ASSERT(condition)  \
        UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
 
+/**
+ * Issue a compilation error if \a __cond is false (this can be used inside an
+ * expression).
+ */
+#define STATIC_ASSERT_EXPR(__cond) \
+       (sizeof(struct { int STATIC_ASSERTION_FAILED__:!!(__cond); }) * 0)
+
 #ifndef ASSERT_TYPE_EQUAL
        /** Ensure two variables have the same type. */
        #define ASSERT_TYPE_EQUAL(var1, var2)  \
@@ -592,4 +626,15 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
                        do { (void)(&(var) == (type *)0); } while(0)
 #endif
 
+/**
+ * Prevent the compiler from optimizing access to the variable \a x, enforcing
+ * a refetch from memory. This also forbid from reordering successing instances
+ * of ACCESS_SAFE().
+ */
+#ifdef __ICCARM__
+#define ACCESS_SAFE(x) x
+#else
+#define ACCESS_SAFE(x) (*(volatile typeof(x) *)&(x))
+#endif
+
 #endif /* BERTOS_COMPILER_H */