X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=38dfe4e9c23a64802799868f7babc01677d501fc;hb=0f018838e0d5130255728bbf3aa69e44e4954239;hp=bbceaaa8b435a4f18eeecf3471e8a90db0a5c32a;hpb=0480653a2b43a2fb4892016d6e8ea7607eae2611;p=bertos.git diff --git a/compiler.h b/compiler.h index bbceaaa8..38dfe4e9 100755 --- a/compiler.h +++ b/compiler.h @@ -1,9 +1,9 @@ /*! * \file * * * \brief Additional support macros for compiler independance @@ -14,83 +14,17 @@ /*#* *#* $Log$ - *#* Revision 1.32 2004/11/16 22:42:44 bernie - *#* Doxygen fixes. + *#* Revision 1.42 2005/02/16 20:28:46 bernie + *#* Move PGM macros to mware/pgm.h *#* - *#* Revision 1.31 2004/11/16 22:37:28 bernie - *#* IPTR: Remove obsolete definition. + *#* Revision 1.41 2005/01/22 04:19:22 bernie + *#* MTIME_INFINITE: New constant. *#* - *#* Revision 1.30 2004/11/16 22:30:19 bernie - *#* Declare fixed-size types before other types. + *#* Revision 1.40 2005/01/20 18:46:04 aleph + *#* Add progmem datatypes; PSTR() definition. *#* - *#* 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. - *#* - *#* Revision 1.26 2004/10/19 08:55:14 bernie - *#* UNUSED_FUNC: New function attribute. - *#* - *#* Revision 1.25 2004/10/19 07:14:20 bernie - *#* Add macros to test for specific compiler features. - *#* - *#* Revision 1.24 2004/10/03 18:35:13 bernie - *#* Poison C++ keywords in C programs for better portability. - *#* - *#* Revision 1.23 2004/09/20 03:30:27 bernie - *#* Remove vsprintf_P() proto, no longer needed with avr-libc 1.0.4. - *#* - *#* Revision 1.22 2004/09/14 21:03:04 bernie - *#* PURE_FUNC, CONST_FUNC, MUST_CHECK: New function attributes; LIKELY()/UNLIKELY(): Fix for non-integral expressions. - *#* - *#* Revision 1.21 2004/09/06 21:38:31 bernie - *#* Misc documentation and style fixes. - *#* - *#* Revision 1.20 2004/08/29 21:57:58 bernie - *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h; - *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef. - *#* - *#* Revision 1.19 2004/08/25 14:12:08 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.18 2004/08/24 16:32:37 bernie - *#* Document custom types. - *#* - *#* Revision 1.17 2004/08/24 13:32:14 bernie - *#* PP_CAT(), PP_STRINGIZE(): Move back to compiler.h to break circular dependency between cpu.h/compiler.h/macros.h; - *#* offsetof(), countof(): Move back to compiler.h to avoid including macros.h almost everywhere; - *#* Trim CVS log; - *#* Rename header guards; - *#* Don't include arch_config.h in compiler.h as it's not needed there. - *#* - *#* Revision 1.16 2004/08/14 19:37:57 rasky - *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc. - *#* - *#* Revision 1.15 2004/08/13 03:23:26 bernie - *#* Adjust a few MSVC tweaks from older projects. - *#* - *#* Revision 1.14 2004/08/10 06:56:29 bernie - *#* RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file. - *#* - *#* Revision 1.13 2004/08/02 20:20:29 aleph - *#* Merge from project_ks - *#* - *#* Revision 1.12 2004/08/01 01:21:17 bernie - *#* LIKELY(), UNLIKELY(): New compiler-specific macros. - *#* - *#* Revision 1.11 2004/07/30 14:34:10 rasky - *#* Vari fix per documentazione e commenti - *#* Aggiunte PP_CATn e STATIC_ASSERT - *#* - *#* Revision 1.10 2004/07/30 14:15:53 rasky - *#* Nuovo supporto unificato per detect della CPU - *#* - *#* Revision 1.9 2004/07/29 22:57:09 bernie - *#* vsprintf(): Remove prototype for backwards compatibility with GCC 3.4; ssize_t: Add definition for inferior compilers. + *#* Revision 1.39 2005/01/08 08:49:39 bernie + *#* Define PROGMEM on AVR only when not including pgmspace.h. *#*/ #ifndef DEVLIB_COMPILER_H #define DEVLIB_COMPILER_H @@ -105,6 +39,11 @@ #define GNUC_PREREQ(maj, min) 0 #endif +/* Some CW versions do not allow enabling C99 from the settings panel. */ +#if defined(__MWERKS__) + #pragma c99 on +#endif + #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) #define COMPILER_C99 1 #else @@ -130,7 +69,8 @@ #define REGISTER shortad #define INLINE /* unsupported */ - /* Imported from . Unfortunately, we can't just include + /* + * 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 @@ -148,9 +88,9 @@ */ struct _JMP_BUF { - void * sp; /* Stack pointer */ - void * return_addr; /* Return address */ - int lr[6]; /* 6 local registers */ + void *sp; /* Stack pointer */ + void *return_addr; /* Return address */ + int lr[6]; /* 6 local registers */ }; typedef struct _JMP_BUF jmp_buf[1]; @@ -166,15 +106,14 @@ #elif defined(_MSC_VER) /* Win32 emulation support */ #include - #include /* for time_t */ /* FIXME: I can't remember why exactly this was needed (NdBernie) */ #define float double - /* Fake bool support */ + /* MSVC doesn't provide . */ #ifndef __cplusplus - #define true 1 - #define false 0 + #define true (1==1) + #define false (1!=1) typedef int bool; #endif /* !__cplusplus */ @@ -208,27 +147,17 @@ #define DEPRECATED __attribute__((__deprecated__)) #endif - #if CPU_X86 - - /* Hack to avoid conflicts with system type */ - #define sigset_t system_sigset_t + #if CPU_AVR #include - #include #include - #undef system_sigset_t - - #elif CPU_AVR + /* TODO: reorganize client code to include mware/pgm.h as needed. */ + #include + #else + /* Include some standard C89/C99 stuff */ #include + #include #include - - /* Support for harvard architectures */ - #ifdef _PROGMEM - #define PGM_READ_CHAR(s) pgm_read_byte(s) - #define PGM_FUNC(x) x ## _P - #define PGM_ATTR PROGMEM - #endif - #endif #ifndef __cplusplus @@ -245,9 +174,12 @@ #elif defined(__MWERKS__) && CPU_DSP56K /* Compiler features */ + #define COMPILER_VARIADIC_MACROS 1 #define COMPILER_TYPEOF 1 #define COMPILER_STATEMENT_EXPRESSIONS 1 + #define typeof __typeof__ + #include #include #include @@ -267,8 +199,8 @@ * \def COMPILER_VARIADIC_MACROS * Support for macros with variable arguments. */ -#ifndef COMPILER_HAVE_VARIADIC_MACROS -#define COMPILER_HAVE_VARIADIC_MACROS (COMPILER_C99 != 0) +#ifndef COMPILER_VARIADIC_MACROS +#define COMPILER_VARIADIC_MACROS (COMPILER_C99 != 0) #endif /*! @@ -341,21 +273,6 @@ #define MUST_CHECK /* nothing */ #endif -/* Support for harvard architectures */ -#ifndef PSTR -#define PSTR /* nothing */ -#endif -#ifndef PGM_READ_CHAR -#define PGM_READ_CHAR(s) (*(s)) -#endif -#ifndef PGM_FUNC -#define PGM_FUNC(x) x -#endif -#ifndef PGM_ATTR -#define PGM_ATTR /* nothing */ -#endif - - /* Misc definitions */ #ifndef NULL #define NULL (void *)0 @@ -399,31 +316,68 @@ #include #endif +#if CPU_AVR_ATMEGA8 + /* + * The ATmega8 has a very small Flash, so we can't afford + * to link in support routines for 32bit integer arithmetic. + */ + 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 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) + #define SIZEOF_UTIME_T (32 / CPU_BITS_PER_CHAR) + #define MTIME_INFINITE 0x7FFFFFFFL +#endif -/* +/*! Bulk storage large enough for both pointers or integers. */ +typedef void * iptr_t; +typedef const void * const_iptr_t; + +typedef unsigned char sig_t; /*!< Type for signal bits. */ +typedef unsigned char sigmask_t; /*!< Type for signal masks. */ +typedef unsigned char page_t; /*!< Type for banked memory pages. */ + + +/*! * \name Standard type definitions. * - * These should be in , but many compilers lack them. + * These should be in or , but many compilers + * and C libraries lack them. + * + * We check for some common definitions to avoid redefinitions: + * + * glibc, avr-libc: _SIZE_T_DEFINED + * Darwin libc: _BSD_SIZE_T_DEFINED_ * * \{ */ -#if !(defined(size_t) || defined(_SIZE_T_DEFINED)) - typedef unsigned int size_t; - typedef int ssize_t; +#if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_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)) - typedef long time_t; + +#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined) || defined(_EMUL)) + /*! For backwards compatibility. Use mtime_t in new code. */ + #define time_t mtime_t + #define SIZEOF_TIME_T SIZEOF_MTIME_T +#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.