X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=2f76b1d31a8f82f758b47ae04240937564d836b9;hb=00e009957d70dab15575ab310ed83f0b78cc8656;hp=65effeca2b5305d49a7cf6a12bd7f9baeec45a64;hpb=ad16d9a71a2a25267ee65a147c8bd73edecf8b8d;p=bertos.git

diff --git a/compiler.h b/compiler.h
index 65effeca..2f76b1d3 100755
--- a/compiler.h
+++ b/compiler.h
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.33  2004/11/16 23:09:40  bernie
+ *#* size_t: Add 64bit definitions; time_t: Add 16bit hack for tiny CPUs.
+ *#*
+ *#* Revision 1.32  2004/11/16 22:42:44  bernie
+ *#* Doxygen fixes.
+ *#*
+ *#* Revision 1.31  2004/11/16 22:37:28  bernie
+ *#* IPTR: Remove obsolete definition.
+ *#*
+ *#* Revision 1.30  2004/11/16 22:30:19  bernie
+ *#* Declare fixed-size types before other types.
+ *#*
+ *#* Revision 1.29  2004/11/16 20:34:40  bernie
+ *#* UNUSED_VAR, USED_VAR, USED_FUNC: New macros; UNUSED_ARG: Rename from UNUSED.
+ *#*
+ *#* Revision 1.28  2004/10/21 11:03:52  bernie
+ *#* Typo.
+ *#*
  *#* Revision 1.27  2004/10/21 10:09:40  bernie
  *#* Remove spurious token in preprocessor directive.
  *#*
@@ -172,18 +190,21 @@
 	/* Compiler features */
 	#define COMPILER_VARIADIC_MACROS 1 /* Even in C++ */
 	#define COMPILER_TYPEOF 1
-	#define COMPILER_STAEMENT_EXPRESSIONS 1
+	#define COMPILER_STATEMENT_EXPRESSIONS 1
 
 	/* GCC attributes */
 	#define FORMAT(type,fmt,first)  __attribute__((__format__(type, fmt, first)))
 	#define NORETURN                __attribute__((__noreturn__))
-	#define UNUSED(type,arg)        __attribute__((__unused__)) type arg
+	#define UNUSED_ARG(type,arg)    __attribute__((__unused__)) type arg
+	#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 LIKELY(x)               __builtin_expect(!!(x), 1)
 	#define UNLIKELY(x)             __builtin_expect(!!(x), 0)
 	#define PURE_FUNC               __attribute__((pure))
 	#define CONST_FUNC              __attribute__((const))
 	#define UNUSED_FUNC             __attribute__((unused))
+	#define USED_FUNC		__attribute__((__used__))
 	#define RESTRICT                __restrict__
 	#define MUST_CHECK              __attribute__((warn_unused_result))
 	#if GNUC_PREREQ(3,1)
@@ -228,7 +249,7 @@
 
 	/* Compiler features */
 	#define COMPILER_TYPEOF 1
-	#define COMPILER_STAEMENT_EXPRESSIONS 1
+	#define COMPILER_STATEMENT_EXPRESSIONS 1
 
 	#include <stdint.h>
 	#include <stddef.h>
@@ -282,8 +303,15 @@
 #ifndef DEPRECATED
 #define DEPRECATED             /* nothing */
 #endif
-#ifndef UNUSED
-#define UNUSED(type,arg)       type arg
+#ifndef UNUSED_ARG
+#define UNUSED_ARG(type,arg)   type arg
+#endif
+#define UNUSED                 UNUSED_ARG /* OBSOLETE */
+#ifndef UNUSED_VAR
+#define UNUSED_VAR(type,name)  type name
+#endif
+#ifndef USED_VAR
+#define USED_VAR(type,name)    type name
 #endif
 #ifndef REGISTER
 #define REGISTER               /* nothing */
@@ -306,6 +334,9 @@
 #ifndef UNUSED_FUNC
 #define UNUSED_FUNC            /* nothing */
 #endif
+#ifndef USED_FUNC
+#define USED_FUNC              /* nothing */
+#endif
 #ifndef RESTRICT
 #define RESTRICT               /* nothing */
 #endif
@@ -349,28 +380,6 @@
 #endif
 
 
-/*
- * Standard type definitions.
- * These should be in <sys/types.h>, but many compilers lack them.
- */
-#if !(defined(size_t) || defined(_SIZE_T_DEFINED))
-	typedef unsigned int size_t;
-	typedef int ssize_t;
-#endif
-#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined))
-	typedef long time_t;
-#endif /* _TIME_T_DEFINED || __time_t_defined */
-
-/*! 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;            /*!< 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__))
 	/*!
 	 * \name ISO C99 fixed-size types
@@ -393,6 +402,52 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 	#include <stdint.h>
 #endif
 
+
+/*
+ * \name Standard type definitions.
+ *
+ * These should be in <sys/types.h>, but many compilers lack them.
+ *
+ * \{
+ */
+#if !(defined(size_t) || defined(_SIZE_T_DEFINED))
+	#if CPU_REG_BITS > 32
+		/* 64bit. */
+		typedef unsigned long size_t;
+		typedef long ssize_t;
+	#else
+		/* 32bit or 16bit. */
+		typedef unsigned int size_t;
+		typedef int ssize_t;
+	#endif
+#endif
+#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined))
+	/*
+	 * The ATmega8 has a very small Flash, so we can't afford to
+	 * link in support routines for 32bit integer arithmetic.
+	 */
+	#if CPU_AVR_ATMEGA8
+		typedef int time_t; /* 16bit. */
+		#define SIZEOF_TIME_T SIZEOF_INT
+	#else
+		typedef long time_t; /* 32bit or 64bit. */
+		#define SIZEOF_TIME_T SIZEOF_LONG
+	#endif
+#else
+	/* Just a guess, but quite safe. */
+	#define SIZEOF_TIME_T SIZEOF_LONG
+#endif /* _TIME_T_DEFINED || __time_t_defined */
+/*\}*/
+
+/*! Bulk storage large enough for both pointers or integers. */
+typedef void * iptr_t;
+typedef const void * const_iptr_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. */
+
 /*!
  * \name Types for hardware registers.
  *
@@ -433,6 +488,6 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 
 /*! Issue a compilation error if the \a condition is false */
 #define STATIC_ASSERT(condition)  \
-	extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
+	UNUSED_VAR(extern char,PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1])
 
 #endif /* DEVLIB_COMPILER_H */