X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=macros.h;h=53ce9a74903e9b496f44c3ca028bc46d90c0e883;hb=f236c8017e2e0398805eedfa05d4b26e7c707a8e;hp=f027ce2bee11039bac286f360d3165a15772325d;hpb=4fcd224037bf57ae177034834492de5521662afd;p=bertos.git

diff --git a/macros.h b/macros.h
index f027ce2b..53ce9a74 100755
--- a/macros.h
+++ b/macros.h
@@ -5,43 +5,52 @@
  * This file is part of DevLib - See devlib/README for information.
  * -->
  *
- * \version $Id$
+ * \brief Common and handy function macros
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Giovanni Bajo <rasky@develer.com>
- *
- * \brief Common and handy function macros
  */
 
-/*
- * $Log$
- * Revision 1.3  2004/08/24 14:13:48  bernie
- * Restore a few macros that were lost in the way.
- *
- * Revision 1.2  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.1  2004/08/14 19:37:57  rasky
- * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
- *
- * Revision 1.4  2004/08/14 18:36:50  rasky
- * Doxygen fix e un livello di parentesi aggiuntivi per la macro
- *
- * Revision 1.3  2004/08/12 20:01:32  rasky
- * Aggiunte macro BIT_CHANGE e BIT_CHANGE_BV
- *
- * Revision 1.2  2004/08/10 21:36:14  rasky
- * Aggiunto include macros.h dove serve
- * Aggiunta dipendenza da compiler.h in macros.h
- *
- * Revision 1.1  2004/08/10 21:30:00  rasky
- * Estratte le funzioni macro in macros.h
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.7  2004/09/20 03:30:45  bernie
+ *#* C++ also has variadic macros.
+ *#*
+ *#* Revision 1.6  2004/09/14 21:02:04  bernie
+ *#* SWAP(), MINMAX(): New macros.
+ *#*
+ *#* Revision 1.5  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.3  2004/08/24 14:13:48  bernie
+ *#* Restore a few macros that were lost in the way.
+ *#*
+ *#* Revision 1.2  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.1  2004/08/14 19:37:57  rasky
+ *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *#*
+ *#* Revision 1.4  2004/08/14 18:36:50  rasky
+ *#* Doxygen fix e un livello di parentesi aggiuntivi per la macro
+ *#*
+ *#* Revision 1.3  2004/08/12 20:01:32  rasky
+ *#* Aggiunte macro BIT_CHANGE e BIT_CHANGE_BV
+ *#*
+ *#* Revision 1.2  2004/08/10 21:36:14  rasky
+ *#* Aggiunto include macros.h dove serve
+ *#* Aggiunta dipendenza da compiler.h in macros.h
+ *#*
+ *#* Revision 1.1  2004/08/10 21:30:00  rasky
+ *#* Estratte le funzioni macro in macros.h
+ *#*
+ *#*/
 
 #ifndef MACROS_H
 #define MACROS_H
@@ -73,6 +82,23 @@
 	#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
 #endif /* !GNUC */
 
+/*! Bound \a x between \a min and \a max */
+#define MINMAX(min,x,max)  (MIN(MAX(min, x), max))
+
+/*!
+ * Type-generic macro to swap a with b
+ *
+ * \note arguments are evaluated multiple times
+ */
+#define SWAP(a, b) \
+	do { \
+		(void)(&(a) == &(b)); /* type check */ \
+		typeof(a) tmp; \
+		tmp = (a); \
+		(a) = (b); \
+		(b) = tmp; \
+	} while (0)
+
 #ifndef BV
 /*! Convert a bit value to a binary flag */
 #define BV(x)       (1<<(x))
@@ -102,7 +128,7 @@
 #define UINT32_LOG2(x) \
 	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
 
-#if COMPILER_C99
+#if COMPILER_C99 || defined(__cplusplus)
 	/*! Count the number of arguments (up to 16) */
 	#define PP_COUNT(...) \
 		PP_COUNT__(__VA_ARGS__,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
@@ -110,11 +136,7 @@
 		count
 #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]
-
-#if COMPILER_C99
+#if COMPILER_C99 || defined(__cplusplus)
 	/*!
 	 * \def BIT_CHANGE(reg, (mask, value), ...)
 	 *