X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=9acdfccc85b7e5fd80d6c50b012d691c337e0d53;hb=de2caf08ef2eca066c3d5a40ab91d7f34c3f555e;hp=62331972442a4e226e7363a08fadbd8fcdbe1145;hpb=75afc1af2ed7408319fef569d1e3b63a56e769c3;p=bertos.git

diff --git a/compiler.h b/compiler.h
index 62331972..9acdfccc 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,18 @@
 
 /*
  * $Log$
+ * Revision 1.15  2004/08/13 03:23:26  bernie
+ * Adjust a few MSVC tweaks from older projects.
+ *
+ * Revision 1.14  2004/08/10 06:56:29  bernie
+ * RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file.
+ *
+ * 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
@@ -110,10 +122,9 @@
 
 	#include <setjmp.h>
 	#include <time.h> /* for time_t */
-	#define float double
 
-	/* Ouch, ReleaseSemaphore() conflicts with a WIN32 call ;-( */
-	#define ReleaseSemaphore KReleaseSemaphore
+	/* FIXME: I can't remember why exactly this was needed (NdBernie) */
+	#define float double
 
 	/* Fake bool support */
 	#ifndef __cplusplus
@@ -122,6 +133,10 @@
 		typedef int bool;
 	#endif /* !__cplusplus */
 
+	/* These C99 functions are oddly named in MSVCRT32.lib */
+	#define snprintf _snprintf
+	#define vsnprintf _vsnprintf
+
 #elif defined(__GNUC__)
 
 	/* GCC attributes */
@@ -129,6 +144,9 @@
 	#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__
 	#if GNUC_PREREQ(3,1)
 		#define DEPRECATED      __attribute__((__deprecated__))
 	#endif
@@ -198,6 +216,15 @@
 #ifndef INTERRUPT
 #define INTERRUPT(x)           ERROR_NOT_IMPLEMENTED
 #endif
+#ifndef LIKELY
+#define LIKELY(x)              x
+#endif
+#ifndef UNLIKELY
+#define UNLIKELY(x)            x
+#endif
+#ifndef RESTRICT
+#define RESTRICT
+#endif
 
 /* Support for harvard architectures */
 #ifndef PSTR
@@ -245,9 +272,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 */
@@ -288,7 +335,7 @@
 
 /*! Issue a compilation error if the \a condition is false */
 #define STATIC_ASSERT(condition)  \
-	extern char CT_ASSERT___[(condition) ? 1 : -1]
+	extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
 
 /*
  * Standard type definitions