X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=cfg%2Fcompiler.h;h=f0f3285e19744c12be272ce0f6cd01a742444f94;hb=00d63661f45019b60d2ae51de2354c193a0b6997;hp=043272fbbe8412786f989c568012182b2c712bdf;hpb=e5b04dc12f28c225dfcc92931bed4598fcf4b639;p=bertos.git diff --git a/cfg/compiler.h b/cfg/compiler.h index 043272fb..f0f3285e 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,15 @@ /*#* *#* $Log$ + *#* Revision 1.12 2006/02/21 16:06:31 bernie + *#* Fix ssize_t redefinitions on glibc systems. + *#* + *#* Revision 1.11 2006/02/20 14:34:58 bernie + *#* Use portable type checking. + *#* + *#* Revision 1.10 2006/02/15 09:12:01 bernie + *#* Fixes for ARM/IAR support. + *#* *#* Revision 1.9 2006/02/10 12:38:00 bernie *#* Add support for ARM on IAR. *#* @@ -97,22 +106,22 @@ #pragma language=extended - // IAR has size_t as built-in type, but does not define this symbol. - #define _SIZE_T_DEFINED - - #ifdef CPU_ARM + #if CPU_ARM #define COMPILER_VARIADIC_MACROS 1 #define INTERRUPT(x) __irq __arm void x (void) - #define REGISTER register #define INLINE static inline /* Include some standard C89/C99 stuff */ #include + #include #include - #else /* CPU_I196 */ + #elif CPU_I196 + + // IAR has size_t as built-in type, but does not define this symbol. + #define _SIZE_T_DEFINED #define INTERRUPT(x) interrupt [x] #define REGISTER shortad @@ -152,7 +161,9 @@ #define false (1!=1) typedef unsigned char bool; - #endif /* !CPU_I196 */ + #else + #error Unsupported CPU + #endif #elif defined(_MSC_VER) /* Win32 emulation support */ @@ -193,9 +204,18 @@ #define DEPRECATED __attribute__((__deprecated__)) #endif + #ifndef __cplusplus + #define ASSERT_TYPE_EQUAL(var1, var2) \ + STATIC_ASSERT(__builtin_types_compatible_p(typeof(var1), typeof(var2))) + #define ASSERT_TYPE_IS(var, type) \ + STATIC_ASSERT(__builtin_types_compatible_p(typeof(var), type)) + #endif + /* Include some standard C89/C99 stuff */ #include + #include #include + #include /* for ssize_t */ #ifndef __cplusplus /* @@ -219,8 +239,8 @@ #define UNUSED_ARG(type,arg) type - #include #include + #include #include // CodeWarrior has size_t as built-in type, but does not define this symbol. @@ -325,18 +345,21 @@ #define EXTERN_C extern "C" #define EXTERN_C_BEGIN extern "C" { #define EXTERN_C_END } + #define EXTERN_CONST extern const #else #define EXTERN_C extern #define EXTERN_C_BEGIN /* nothing */ #define EXTERN_C_END /* nothing */ + #define EXTERN_CONST const #endif -#if (defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) +#if defined(_MSC_VER) + || ((defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) && CPU_I196) /*! * \name ISO C99 fixed-size types * - * These should be in , but many compilers lack them. + * These should be in , but a few compilers lack them. * \{ */ typedef signed char int8_t; @@ -398,12 +421,14 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ * * We check for some common definitions to avoid redefinitions: * - * glibc, avr-libc: _SIZE_T_DEFINED + * glibc, avr-libc: _SIZE_T_DEFINED, __ssize_t_defined * Darwin libc: _BSD_SIZE_T_DEFINED_ + * IAR ARM: _SIZE_T * * \{ */ -#if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_)) +#if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_) \ + || defined(_SIZE_T)) #if CPU_X86 /* 32bit or 64bit (32bit for _WIN64). */ typedef unsigned long size_t; @@ -416,6 +441,8 @@ 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 + typedef int ssize_t; #elif CPU_AVR /* 16bit (missing in avr-libc's sys/types.h). */ typedef int ssize_t; @@ -466,6 +493,18 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ /*! Issue a compilation error if the \a condition is false */ #define STATIC_ASSERT(condition) \ - UNUSED_VAR(extern char,PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]) + UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1]) + +#ifndef ASSERT_TYPE_EQUAL +/*! Ensure two variables have the same type. */ +#define ASSERT_TYPE_EQUAL(var1, var2) \ + do { (void)(&(var1) == &(var2)); } while(0) +#endif + +#ifndef ASSERT_TYPE_IS +/*! Ensure variable is of specified type. */ +#define ASSERT_TYPE_IS(var, type) \ + do { (void)(&var == (type *)0); } while(0) +#endif #endif /* DEVLIB_COMPILER_H */