X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=e27959c7d76090a994e1cfeff16180ae33e353bc;hb=344e6430515e678c2b6c9f09f7b7587836d13449;hp=0683d7e29cca7cb5e286e9a9e9fe21b8972dcb5e;hpb=94d6b489cc031d86359c89ef1f2f0669a8bf0094;p=bertos.git

diff --git a/compiler.h b/compiler.h
index 0683d7e2..e27959c7 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.22  2004/09/14 21:03:04  bernie
+ *#* PURE_FUNC, CONST_FUNC, MUST_CHECK: New function attributes; LIKELY()/UNLIKELY(): Fix for non-integral expressions.
+ *#*
+ *#* Revision 1.21  2004/09/06 21:38:31  bernie
+ *#* Misc documentation and style fixes.
+ *#*
  *#* Revision 1.20  2004/08/29 21:57:58  bernie
  *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h;
  *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.
@@ -154,16 +160,19 @@
 	#define NORETURN                __attribute__((__noreturn__))
 	#define UNUSED(type,arg)        __attribute__((__unused__)) type arg
 	#define INLINE                  static inline __attribute__((__always_inline__))
-	#define LIKELY(x)               __builtin_expect((x), 1)
-	#define UNLIKELY(x)             __builtin_expect((x), 0)
-	#define RESTRICT		__restrict__
+	#define LIKELY(x)               __builtin_expect(!!(x), 1)
+	#define UNLIKELY(x)             __builtin_expect(!!(x), 0)
+	#define PURE_FUNC               __attribute__((pure))
+	#define CONST_FUNC              __attribute__((const))
+	#define RESTRICT                __restrict__
+	#define MUST_CHECK              __attribute__((warn_unused_result))
 	#if GNUC_PREREQ(3,1)
-		#define DEPRECATED      __attribute__((__deprecated__))
+		#define DEPRECATED  __attribute__((__deprecated__))
 	#endif
 
 	#if CPU_X86
 
-		/* hack to avoid conflicts with system type */
+		/* Hack to avoid conflicts with system type */
 		#define sigset_t system_sigset_t
 		#include <stddef.h>
 		#include <setjmp.h>
@@ -232,8 +241,17 @@
 #ifndef UNLIKELY
 #define UNLIKELY(x)            x
 #endif
+#ifndef PURE_FUNC
+#define PURE_FUNC              /* nothing */
+#endif
+#ifndef CONST_FUNC
+#define CONST_FUNC             /* nothing */
+#endif
 #ifndef RESTRICT
-#define RESTRICT
+#define RESTRICT               /* nothing */
+#endif
+#ifndef MUST_CHECK
+#define MUST_CHECK             /* nothing */
 #endif
 
 /* Support for harvard architectures */
@@ -306,7 +324,7 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 	typedef unsigned short int  uint16_t;
 	typedef unsigned long int   uint32_t;
 	/* \} */
-#elif defined(__GNUC__) && defined(__AVR__)
+#elif defined(__GNUC__) && CPU_AVR
 	/* avr-libc is weird... */
 	#include <inttypes.h>
 #else
@@ -336,7 +354,7 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 /* Quasi-ANSI macros */
 #ifndef offsetof
 	/*!
-	 * Return the byte offset of the member \a m in struct \a s
+	 * Return the byte offset of the member \a m in struct \a s.
 	 *
 	 * \note This macro should be defined in "stddef.h" and is sometimes
 	 *       compiler-specific (g++ has a builtin for it).
@@ -345,9 +363,9 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 #endif
 #ifndef countof
 	/*!
-	 * Count the number of elements in the static array \a a
+	 * Count the number of elements in the static array \a a.
 	 *
-	 * \note This macro is non-standard, but implmenents a very common idiom
+	 * \note This macro is non-standard, but implements a very common idiom
 	 */
 	#define countof(a)  (sizeof(a) / sizeof(*(a)))
 #endif