X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fcompiler.h;h=907b23e6d1749cf496a675937e580898d1ee0f73;hb=a3f9ca9d86b7f8da31204746cc32e13c2dbe5ed0;hp=bd60c6e79b74f534688c4816526126f835cb2ef7;hpb=4daefac32ad5a2198f911584f1e5abea001d6062;p=bertos.git

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index bd60c6e7..907b23e6 100644
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -33,7 +33,6 @@
  *
  * \brief Additional support macros for compiler independance
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
@@ -74,6 +73,34 @@
 #define PP_STRINGIZE__(x)   #x
 
 
+/**
+ */
+#if COMPILER_C99
+	#define COUNT_PARMS2(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _, ...) _
+	#define COUNT_PARMS(...) \
+			COUNT_PARMS2(11 , ## __VA_ARGS__, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+
+	/**
+	 * usage:
+	 * \code
+	 * #define foo_init(...) PP_CAT(foo_init_, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	 * \endcode
+	 */
+
+#else
+	#define COUNT_PARMS2(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _, ...) _
+	#define COUNT_PARMS(args...) \
+			COUNT_PARMS2(11 , ## args, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+
+	/**
+	 * usage:
+	 * \code
+	 * #define foo_init(args...) PP_CAT(foo_init_, COUNT_PARMS(args)) (args)
+	 * \endcode
+	 */
+
+#endif
+
 #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)
 
 	#pragma language=extended
@@ -172,6 +199,7 @@
 	#define UNUSED_VAR(type,name)	__attribute__((__unused__)) type name
 	#define USED_VAR(type,name)     __attribute__((__used__)) type name
 	#define INLINE                  static inline __attribute__((__always_inline__))
+	#define NOINLINE                __attribute__((noinline))
 	#define LIKELY(x)               __builtin_expect(!!(x), 1)
 	#define UNLIKELY(x)             __builtin_expect(!!(x), 0)
 	#define PURE_FUNC               __attribute__((pure))
@@ -181,6 +209,12 @@
 	#define RESTRICT                __restrict__
 	#define MUST_CHECK              __attribute__((warn_unused_result))
 	#define PACKED                  __attribute__((packed))
+	#if CPU_ARM | CPU_CM3
+		#define NAKED		__attribute__((naked))
+	#else
+		#define NAKED
+	#endif
+
 	/**
 	 * Force compiler to realod context variable.
 	 */
@@ -275,6 +309,9 @@
 #ifndef INLINE
 #define INLINE                 static inline
 #endif
+#ifndef NOINLINE
+#define NOINLINE               /* nothing */
+#endif
 #ifndef NORETURN
 #define NORETURN               /* nothing */
 #endif
@@ -417,7 +454,6 @@ typedef const void * const_iptr_t;
 
 typedef unsigned char sigbit_t;  /**< Type for signal bits. */
 typedef unsigned char sigmask_t; /**< Type for signal masks. */
-typedef unsigned char page_t;    /**< Type for banked memory pages. */
 
 
 /**
@@ -448,10 +484,10 @@ typedef unsigned char page_t;    /**< Type for banked memory pages. */
 	#if CPU_X86
 		/* 32bit or 64bit (32bit for _WIN64). */
 		typedef long ssize_t;
-	#elif CPU_ARM
+	#elif CPU_ARM || CPU_CM3
 		typedef int ssize_t;
-	#elif CPU_AVR
-		/* 16bit (missing in avr-libc's sys/types.h). */
+	#elif CPU_AVR || CPU_MSP430
+		/* 16bit (missing in avr-/msp430-libc's sys/types.h). */
 		typedef int ssize_t;
 	#else
 		#error Unknown CPU