* \brief Additional support macros for compiler independance
*/
-/*
- * $Log$
- * 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
- *
- * 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.
- *
- * Revision 1.8 2004/07/20 23:43:39 bernie
- * Use attribute((always_inline)) to force inlining. This fixes the much
- * hated need of redundant prototypes for inline functions.
- *
- * Revision 1.7 2004/07/20 23:26:48 bernie
- * Fix two errors introduced by previous commit.
- *
- * Revision 1.6 2004/07/20 23:12:43 bernie
- * *** empty log message ***
- *
- * Revision 1.5 2004/07/20 17:08:03 bernie
- * Cleanup documentation
- *
- * Revision 1.4 2004/06/27 15:20:26 aleph
- * Change UNUSED() macro to accept two arguments: type and name;
- * Add macro GNUC_PREREQ to detect GCC version during build;
- * Some spacing cleanups and typo fix
- *
- * Revision 1.3 2004/06/06 18:00:39 bernie
- * PP_CAT(): New macro.
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/05/23 17:48:35 bernie
- * Add top-level files.
- *
- */
-#ifndef COMPILER_H
-#define COMPILER_H
+/*#*
+ *#* $Log$
+ *#* 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.
+ *#*
+ *#* Revision 1.19 2004/08/25 14:12:08 rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.18 2004/08/24 16:32:37 bernie
+ *#* Document custom types.
+ *#*
+ *#* Revision 1.17 2004/08/24 13:32:14 bernie
+ *#* PP_CAT(), PP_STRINGIZE(): Move back to compiler.h to break circular dependency between cpu.h/compiler.h/macros.h;
+ *#* offsetof(), countof(): Move back to compiler.h to avoid including macros.h almost everywhere;
+ *#* Trim CVS log;
+ *#* Rename header guards;
+ *#* Don't include arch_config.h in compiler.h as it's not needed there.
+ *#*
+ *#* 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
+ *#*
+ *#* 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.
+ *#*/
+#ifndef DEVLIB_COMPILER_H
+#define DEVLIB_COMPILER_H
-#include "arch_config.h"
#include "cpu_detect.h"
#define GNUC_PREREQ(maj, min) 0
#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+ #define COMPILER_C99 1
+#else
+ #define COMPILER_C99 0
+#endif
+
+
+/*! 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_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
+
+
#if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)
#pragma language=extended
#define INTERRUPT(x) interrupt [x]
#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
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 */
/* Misc definitions */
#ifndef NULL
-#define NULL 0
+#define NULL (void *)0
#endif
#ifndef EOF
#define EOF (-1)
#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 */
-#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 */
-#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
-#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 PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
-
/*
- * Standard type definitions
+ * Standard type definitions.
* These should be in <sys/types.h>, but many compilers lack them.
*/
#if !(defined(size_t) || defined(_SIZE_T_DEFINED))
typedef long time_t;
#endif /* _TIME_T_DEFINED || __time_t_defined */
-/*! Storage for pointers and integers */
-#define IPTR void *
+/*! Bulk storage large enough for both pointers or integers */
+typedef void * iptr_t;
+typedef const void * const_iptr_t;
+#define IPTR iptr_t /* OBSOLETE */
-typedef long utime_t;
-typedef unsigned char sig_t;
-typedef unsigned char sigset_t;
-typedef unsigned char page_t;
+typedef long utime_t; /*!< Type for time expressed in microseconds */
+typedef unsigned char sig_t; /*!< Type for signal bits */
+typedef unsigned char sigset_t; /*!< Type for signal masks */
+typedef unsigned char page_t; /*!< Type for banked memory pages */
#if (defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__))
- /*
- * ISO C99 fixed-size types
+ /*!
+ * \name ISO C99 fixed-size types
+ *
* These should be in <stdint.h>, but many compilers lack them.
+ * \{
*/
typedef signed char int8_t;
typedef short int int16_t;
typedef unsigned char uint8_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? */
+ /* \} */
+#elif defined(__GNUC__) && defined(__AVR__)
/* avr-libc is weird... */
#include <inttypes.h>
#else
#endif
/*\}*/
-#endif /* COMPILER_H */
+
+/* Quasi-ANSI macros */
+#ifndef offsetof
+ /*!
+ * 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).
+ */
+ #define offsetof(s,m) (size_t)&(((s *)0)->m)
+#endif
+#ifndef countof
+ /*!
+ * Count the number of elements in the static array \a a
+ *
+ * \note This macro is non-standard, but implmenents a very common idiom
+ */
+ #define countof(a) (sizeof(a) / sizeof(*(a)))
+#endif
+
+/*! Issue a compilation error if the \a condition is false */
+#define STATIC_ASSERT(condition) \
+ extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
+
+#endif /* DEVLIB_COMPILER_H */