X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=f0f3285e19744c12be272ce0f6cd01a742444f94;hb=00d63661f45019b60d2ae51de2354c193a0b6997;hp=456309427f51c74aca850ae9f41c6605fac00867;hpb=c41211f2309fd5499f0ff6768314a0a260d27d1d;p=bertos.git diff --git a/cfg/compiler.h b/cfg/compiler.h index 45630942..f0f3285e 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,30 @@ /*#* *#* $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. + *#* + *#* Revision 1.8 2006/01/16 03:27:49 bernie + *#* Rename sig_t to sigbit_t to avoid clash with POSIX. + *#* + *#* Revision 1.7 2005/11/27 23:33:05 bernie + *#* Drop avr-libc hack for missing stdint.h. + *#* + *#* Revision 1.6 2005/07/19 07:27:31 bernie + *#* Don't use CPU_REG_BITS from cpu.h to avoid circular header dependendy. + *#* + *#* Revision 1.5 2005/06/27 21:24:37 bernie + *#* ticks_t: New typedef. + *#* *#* Revision 1.4 2005/06/14 06:15:10 bernie *#* Add X86_64 support. *#* @@ -79,44 +103,67 @@ #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) + #pragma language=extended - #define INTERRUPT(x) interrupt [x] - #define REGISTER shortad - #define INLINE /* unsupported */ - /* - * Imported from . Unfortunately, we can't just include - * this header because it typedefs jmp_buf to be an array of chars. - * This would allow the compiler to place the buffer on an odd address. - * The CPU _should_ be able to perform word accesses to - * unaligned data, but there are *BUGS* in the 80196KC with - * some combinations of opcodes and addressing modes. One of - * these, "ST SP,[?GR]+" is used in the longjmp() implementation - * provided by the IAR compiler ANSI C library. When ?GR contains - * an odd address, surprisingly the CPU will copy the high order - * byte of the source operand (SP) in the low order byte of the - * destination operand (the memory location pointed to by ?GR). - * - * We also need to replace the library setjmp()/longjmp() with - * our own versions because the IAR implementation "forgets" to - * save the contents of local registers (?LR). - */ - struct _JMP_BUF - { - void *sp; /* Stack pointer */ - void *return_addr; /* Return address */ - int lr[6]; /* 6 local registers */ - }; + #if CPU_ARM + + #define COMPILER_VARIADIC_MACROS 1 - typedef struct _JMP_BUF jmp_buf[1]; + #define INTERRUPT(x) __irq __arm void x (void) + #define INLINE static inline - int setjmp(jmp_buf env); - void longjmp(jmp_buf env, int val); + /* Include some standard C89/C99 stuff */ + #include + #include + #include + + #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 + #define INLINE /* unsupported */ + + /* + * Imported from . Unfortunately, we can't just include + * this header because it typedefs jmp_buf to be an array of chars. + * This would allow the compiler to place the buffer on an odd address. + * The CPU _should_ be able to perform word accesses to + * unaligned data, but there are *BUGS* in the 80196KC with + * some combinations of opcodes and addressing modes. One of + * these, "ST SP,[?GR]+" is used in the longjmp() implementation + * provided by the IAR compiler ANSI C library. When ?GR contains + * an odd address, surprisingly the CPU will copy the high order + * byte of the source operand (SP) in the low order byte of the + * destination operand (the memory location pointed to by ?GR). + * + * We also need to replace the library setjmp()/longjmp() with + * our own versions because the IAR implementation "forgets" to + * save the contents of local registers (?LR). + */ + struct _JMP_BUF + { + void *sp; /* Stack pointer */ + void *return_addr; /* Return address */ + int lr[6]; /* 6 local registers */ + }; + + typedef struct _JMP_BUF jmp_buf[1]; + + int setjmp(jmp_buf env); + void longjmp(jmp_buf env, int val); + + /* Fake bool support */ + #define true (1==1) + #define false (1!=1) + typedef unsigned char bool; - /* Fake bool support */ - #define true (1==1) - #define false (1!=1) - typedef unsigned char bool; + #else + #error Unsupported CPU + #endif #elif defined(_MSC_VER) /* Win32 emulation support */ @@ -157,15 +204,19 @@ #define DEPRECATED __attribute__((__deprecated__)) #endif - #if CPU_AVR - #include - #include - #else - /* Include some standard C89/C99 stuff */ - #include - #include + #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 /* * Disallow some C++ keywords as identifiers in C programs, @@ -188,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. @@ -212,7 +263,7 @@ /*! * \def COMPILER_TYPEOF - * Support for macros with variable arguments. + * Support for dynamic type identification. */ #ifndef COMPILER_TYPEOF #define COMPILER_TYPEOF 0 @@ -220,7 +271,7 @@ /*! * \def COMPILER_STATEMENT_EXPRESSIONS - * Support for macros with variable arguments. + * Support for statement expressions. */ #ifndef COMPILER_STATEMENT_EXPRESSIONS #define COMPILER_STATEMENT_EXPRESSIONS 0 @@ -294,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; @@ -323,11 +377,8 @@ typedef unsigned long long uint64_t; #endif /* \} */ -#elif defined(__GNUC__) && CPU_AVR - /* avr-libc is weird... (Fixed in avr-libc-1.2, hack to be removed soon) */ - #include #else - /* This is the correct location. */ + /* This is the standard location. */ #include #endif @@ -336,12 +387,14 @@ * The ATmega8 has a very small Flash, so we can't afford * to link in support routines for 32bit integer arithmetic. */ + typedef int16_t ticks_t; /*!< Type for time expressed in ticks. */ typedef int16_t mtime_t; /*!< Type for time expressed in milliseconds. */ typedef int16_t utime_t; /*!< Type for time expressed in microseconds. */ #define SIZEOF_MTIME_T (16 / CPU_BITS_PER_CHAR) #define SIZEOF_UTIME_T (16 / CPU_BITS_PER_CHAR) #define MTIME_INFINITE 0x7FFFL #else + typedef int32_t ticks_t; /*!< Type for time expressed in ticks. */ typedef int32_t mtime_t; /*!< Type for time expressed in milliseconds. */ typedef int32_t utime_t; /*!< Type for time expressed in microseconds. */ #define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR) @@ -351,9 +404,11 @@ /*! Bulk storage large enough for both pointers or integers. */ typedef void * iptr_t; + +/*! Bulk storage large enough for both pointers to constants or integers. */ typedef const void * const_iptr_t; -typedef unsigned char sig_t; /*!< Type for signal bits. */ +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. */ @@ -366,28 +421,33 @@ 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 CPU_REG_BITS > 32 - /* 64bit. */ +#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; #else - /* 32bit or 16bit. */ - typedef unsigned int size_t; + #error Unknown CPU #endif #endif #if !(defined(ssize_t) || defined(__ssize_t_defined)) - #if CPU_REG_BITS > 32 - /* 64bit (32bit for _WIN64). */ + #if CPU_X86 + /* 32bit or 64bit (32bit for _WIN64). */ typedef long ssize_t; - #else - /* 32bit or 16bit. */ + #elif CPU_ARM typedef int ssize_t; + #elif CPU_AVR + /* 16bit (missing in avr-libc's sys/types.h). */ + typedef int ssize_t; + #else + #error Unknown CPU #endif #endif /*\}*/ @@ -433,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 */