X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=a2689e8e46b770ee417a2a861d714140b3e20c8d;hb=4afd09ec0c80aa1611fc3b5a3517e9c0d1755cfd;hp=e15059e229c35ecc670e06a87de2972dfeebb5b3;hpb=62138b859dd954a5cf7471a2c3b487da5e5c1b4d;p=bertos.git

diff --git a/compiler.h b/compiler.h
index e15059e2..a2689e8e 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,19 @@
 
 /*
  * $Log$
+ * Revision 1.13  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
+ *
+ * Revision 1.12  2004/08/01 01:21:17  bernie
+ * LIKELY(), UNLIKELY(): New compiler-specific macros.
+ *
+ * Revision 1.11  2004/07/30 14:34:10  rasky
+ * Vari fix per documentazione e commenti
+ * Aggiunte PP_CATn e STATIC_ASSERT
+ *
+ * Revision 1.10  2004/07/30 14:15:53  rasky
+ * Nuovo supporto unificato per detect della CPU
+ *
  * Revision 1.9  2004/07/29 22:57:09  bernie
  * vsprintf(): Remove prototype for backwards compatibility with GCC 3.4; ssize_t: Add definition for inferior compilers.
  *
@@ -50,6 +63,7 @@
 #define COMPILER_H
 
 #include "arch_config.h"
+#include "cpu_detect.h"
 
 
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -121,11 +135,13 @@
 	#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)
 	#if GNUC_PREREQ(3,1)
 		#define DEPRECATED      __attribute__((__deprecated__))
 	#endif
 
-	#if defined(__i386__)
+	#if CPU_X86
 
 		/* hack to avoid conflicts with system type */
 		#define sigset_t system_sigset_t
@@ -134,7 +150,7 @@
 		#include <stdbool.h>
 		#undef system_sigset_t
 
-	#elif defined(__AVR__)
+	#elif CPU_AVR
 
 		#include <stddef.h>
 		#include <stdbool.h>
@@ -151,15 +167,18 @@
 			#define PGM_ATTR        PROGMEM
 		#endif
 
-	#endif /* CPU */
+	#endif
 
-#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__))
+#elif defined(__MWERKS__) && CPU_DSP56K
 
 	#include <stdint.h>
 	#include <stddef.h>
 	#include <stdbool.h>
 	#include <setjmp.h>
 
+	// CodeWarrior has size_t as built-in type, but does not define this symbol.
+	#define _SIZE_T_DEFINED
+
 #else
 	#error unknown compiler
 #endif
@@ -187,6 +206,12 @@
 #ifndef INTERRUPT
 #define INTERRUPT(x)           ERROR_NOT_IMPLEMENTED
 #endif
+#ifndef LIKELY
+#define LIKELY(x)              x
+#endif
+#ifndef UNLIKELY
+#define UNLIKELY(x)            x
+#endif
 
 /* Support for harvard architectures */
 #ifndef PSTR
@@ -234,9 +259,29 @@
 
 
 /* Simple macros */
-#define ABS(a)		(((a) < 0) ? -(a) : (a))
-#define MIN(a,b)	(((a) < (b)) ? (a) : (b))
-#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#if GNUC_PREREQ(2,0)
+	#define ABS(n) ({ \
+		__typeof__(n) _n = (n); \
+		(_n < 0) ? -_n : _n; \
+	})
+	#define MIN(a,b) ({ \
+		__typeof__(a) _a = (a); \
+		__typeof__(b) _b = (b); \
+		(void)(&_a == &_b); /* ensure same type */ \
+		(_a < _b) ? _a : _b; \
+	})
+	#define MAX(a,b) ({ \
+		__typeof__(a) _a = (a); \
+		__typeof__(b) _b = (b); \
+		(void)(&_a == &_b); /* ensure same type */ \
+		(_a > _b) ? _a : _b; \
+	})
+#else /* !GNUC */
+	/* Buggy macros for inferior compilers */
+	#define ABS(a)		(((a) < 0) ? -(a) : (a))
+	#define MIN(a,b)	(((a) < (b)) ? (a) : (b))
+	#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#endif /* !GNUC */
 
 #ifndef BV
 /*! Convert a bit value to a binary flag */
@@ -265,9 +310,19 @@
 	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
 
 /*! Concatenate two different preprocessor tokens (allowing macros to expand) */
-#define PP_CAT(x,y)      PP_CAT__(x,y)
-#define PP_CAT__(x,y)    x ## y
+#define PP_CAT(x,y)         PP_CAT__(x,y)
+#define PP_CAT__(x,y)       x ## y
+#define PP_CAT3(x,y,z)      PP_CAT(PP_CAT(x,y),z)
+#define PP_CAT4(x,y,z,w)    PP_CAT(PP_CAT3(x,y,z),w)
+#define PP_CAT5(x,y,z,w,j)  PP_CAT(PP_CAT4(x,y,z,w),j)
+
+/*! String-ize a token (allowing macros to expand) */
+#define PP_STRINGIZE(x)     PP_STRINGIZE__(x)
+#define PP_STRINGIZE__(x)   #x
 
+/*! Issue a compilation error if the \a condition is false */
+#define STATIC_ASSERT(condition)  \
+	extern char CT_ASSERT___[(condition) ? 1 : -1]
 
 /*
  * Standard type definitions
@@ -301,6 +356,7 @@ typedef unsigned char page_t;
 	typedef unsigned short int  uint16_t;
 	typedef unsigned long int   uint32_t;
 #elif defined(__AVR__)
+	/* TODO: should this detect GCC+AVR combo, or just CPU_AVR? */
 	/* avr-libc is weird... */
 	#include <inttypes.h>
 #else
@@ -316,7 +372,7 @@ typedef unsigned char page_t;
  *
  * \{
  */
-#if (defined(__m56800E__) || defined(__m56800__))
+#if CPU_DSP56K
 	/* Registers can be accessed only through 16-bit pointers */
 	typedef volatile uint16_t  reg16_t;
 #else