X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=d0049e38186b3459e6e8233b85854e87c34eb61c;hb=4560fc1a4dc7c27243d7f8afa9a1291e646c2f8b;hp=863fbbe40266c92375c02dd1076f0ccfcdfef1e9;hpb=d8c41d44af59c3b699736024da1ccc11efa52384;p=bertos.git

diff --git a/compiler.h b/compiler.h
index 863fbbe4..d0049e38 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,25 @@
 
 /*
  * $Log$
+ * Revision 1.16  2004/08/14 19:37:57  rasky
+ * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *
+ * 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
+ *
  * Revision 1.10  2004/07/30 14:15:53  rasky
  * Nuovo supporto unificato per detect della CPU
  *
@@ -63,6 +82,12 @@
 	#define GNUC_PREREQ(maj, min) 0
 #endif
 
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	#define COMPILER_C99      1
+#else
+	#define COMPILER_C99      0
+#endif
+
 #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)
 	#pragma language=extended
 	#define INTERRUPT(x)  interrupt [x]
@@ -106,10 +131,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
@@ -118,6 +142,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 */
@@ -125,6 +153,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
@@ -194,6 +225,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
@@ -229,53 +269,6 @@
 #endif
 
 
-/* Quasi-ANSI macros */
-#ifndef offsetof
-	/*! offsetof(s,m) - Return the byte offset of the member \a m in struct \a s */
-	#define offsetof(s,m)   (size_t)&(((s *)0)->m)
-#endif
-#ifndef countof
-	/*! Count the number of elements in the static array \a a */
-	#define countof(a) (sizeof(a) / sizeof(*(a)))
-#endif
-
-
-/* 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))
-
-#ifndef BV
-/*! Convert a bit value to a binary flag */
-#define BV(x)	(1<<(x))
-#endif
-
-/*! Round up \a x to an even multiple of the 2's power \a pad */
-#define ROUND2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
-
-/*! Calculate a compile-time log2 for a uint8_t */
-#define UINT8_LOG2(x) \
-	((x) < 2 ? 0 : \
-	 ((x) < 4 ? 1 : \
-	  ((x) < 8 ? 2 : \
-	   ((x) < 16 ? 3 : \
-	    ((x) < 32 ? 4 : \
-	     ((x) < 64 ? 5 : \
-	      ((x) < 128 ? 6 : 7)))))))
-
-/*! Calculate a compile-time log2 for a uint16_t */
-#define UINT16_LOG2(x) \
-	((x < 256) ? UINT8_LOG2(x) : UINT8_LOG2((x) >> 8) + 8)
-
-/*! Calculate a compile-time log2 for a uint32_t */
-#define UINT32_LOG2(x) \
-	((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
-
-
 /*
  * Standard type definitions
  * These should be in <sys/types.h>, but many compilers lack them.