X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=028ef3ad57fafaeabedba505713993b3e18836de;hb=3b33848a29f6a9ba49a2913ba6b721e01d8b95f5;hp=ddb270e1e1861054fa6d064f83467b77c27cacc1;hpb=bd753119c1f64f7531a6fe3b40e367665614840c;p=bertos.git diff --git a/cfg/compiler.h b/cfg/compiler.h index ddb270e1..028ef3ad 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,42 @@ /*#* *#* $Log$ + *#* Revision 1.19 2006/04/11 00:07:33 bernie + *#* Implemenent MF_SAVESEL flag. + *#* + *#* Revision 1.18 2006/03/22 13:34:34 bernie + *#* MSVC support. + *#* + *#* Revision 1.17 2006/03/22 09:48:35 bernie + *#* Formatting. + *#* + *#* Revision 1.16 2006/03/20 17:48:09 bernie + *#* Fix for avr-libc; INTERRUPT(): Remove macro. + *#* + *#* Revision 1.15 2006/03/13 02:06:25 bernie + *#* containerof(): New macro. + *#* + *#* Revision 1.14 2006/02/23 08:36:33 bernie + *#* Emulate __func__ on MSVC. + *#* + *#* Revision 1.13 2006/02/23 07:37:37 bernie + *#* Compile fix for MSVC. + *#* + *#* 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. *#* @@ -88,44 +124,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 + + #define INTERRUPT(x) __irq __arm void x (void) + #define INLINE static inline + + /* 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 - typedef struct _JMP_BUF jmp_buf[1]; + #define INTERRUPT(x) interrupt [x] + #define REGISTER shortad + #define INLINE /* unsupported */ - int setjmp(jmp_buf env); - void longjmp(jmp_buf env, int val); + /* + * 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 */ @@ -140,6 +199,14 @@ #define snprintf _snprintf #define vsnprintf _vsnprintf + /* MSVC doesn't support C99's __func__, but has a similar extension. */ + #define __func__ __FUNCTION__ + + /* MSVC doesn't support C99's inline keyword */ + #ifndef __cplusplus + #define INLINE __inline + #endif + #elif defined(__GNUC__) /* Compiler features */ @@ -166,9 +233,20 @@ #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 + #if !CPU_AVR + #include /* for ssize_t */ + #endif #ifndef __cplusplus /* @@ -192,8 +270,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. @@ -216,7 +294,7 @@ /*! * \def COMPILER_TYPEOF - * Support for macros with variable arguments. + * Support for dynamic type identification. */ #ifndef COMPILER_TYPEOF #define COMPILER_TYPEOF 0 @@ -224,7 +302,7 @@ /*! * \def COMPILER_STATEMENT_EXPRESSIONS - * Support for macros with variable arguments. + * Support for statement expressions. */ #ifndef COMPILER_STATEMENT_EXPRESSIONS #define COMPILER_STATEMENT_EXPRESSIONS 0 @@ -256,9 +334,6 @@ #ifndef REGISTER #define REGISTER /* nothing */ #endif -#ifndef INTERRUPT -#define INTERRUPT(x) ERROR_NOT_IMPLEMENTED -#endif #ifndef LIKELY #define LIKELY(x) x #endif @@ -298,18 +373,23 @@ #define EXTERN_C extern "C" #define EXTERN_C_BEGIN extern "C" { #define EXTERN_C_END } + #define EXTERN_CONST extern const + #define CONST_CAST(TYPE,EXPR) (const_cast(EXPR)) #else #define EXTERN_C extern #define EXTERN_C_BEGIN /* nothing */ #define EXTERN_C_END /* nothing */ + #define EXTERN_CONST const + #define CONST_CAST(TYPE,EXPR) ((TYPE)(EXPR)) /* FIXME: How can we suppress the warning in C? */ #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; @@ -358,7 +438,7 @@ 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. */ @@ -371,12 +451,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 - * Darwin libc: _BSD_SIZE_T_DEFINED_ + * glibc, avr-libc: _SIZE_T_DEFINED, __ssize_t_defined + * Darwin libc: _BSD_SIZE_T_DEFINED_, _SIZE_T + * 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; @@ -385,10 +467,12 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ #endif #endif -#if !(defined(ssize_t) || defined(__ssize_t_defined)) +#if !(defined(ssize_t) || defined(_SSIZE_T) || defined(__ssize_t_defined)) #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; @@ -437,8 +521,37 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ #define countof(a) (sizeof(a) / sizeof(*(a))) #endif +/** + * Cast a member of a structure out to the containing structure. + * + * \param ptr the pointer to the member. + * \param type the type of the container struct this is embedded in. + * \param member the name of the member within the struct. + */ +#if COMPILER_TYPEOF && COMPILER_STATEMENT_EXPRESSIONS + #define containerof(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *_mptr = (ptr); /* type check */ \ + (type *)((char *)_mptr - offsetof(type, member)); \ + }) +#else + #define containerof(ptr, type, member) \ + ( (type *)((char *)(ptr) - offsetof(type, member)) ) +#endif + /*! 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 */