X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=933a3f19977a99cdcce29b65739aaa3e9bdd01e6;hb=867d039ebb920f195d17fbc018c7af72f0c33596;hp=a81120f498ca3ec0721bff2a14cb6a4b9c2aa221;hpb=380bc36d2969fd9d730fee770ce16d7f859ec211;p=bertos.git diff --git a/compiler.h b/compiler.h index a81120f4..933a3f19 100755 --- a/compiler.h +++ b/compiler.h @@ -6,15 +6,38 @@ * This file is part of DevLib - See devlib/README for information. * --> * - * \version $Id$ + * \brief Additional support macros for compiler independance * + * \version $Id$ * \author Bernardo Innocenti - * - * \brief Additional support macros for compiler independance */ /*#* *#* $Log$ + *#* 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. *#* @@ -152,16 +175,28 @@ #elif defined(__GNUC__) + /* Compiler features */ + #define COMPILER_VARIADIC_MACROS 1 /* Even in C++ */ + #define COMPILER_TYPEOF 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 RESTRICT __restrict__ + #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) - #define DEPRECATED __attribute__((__deprecated__)) + #define DEPRECATED __attribute__((__deprecated__)) #endif #if CPU_X86 @@ -178,22 +213,32 @@ #include #include - /* Missing printf-family functions in avr-libc/stdio.h */ - #include - #include - int vsprintf_P(char *buf, const char * PROGMEM fmt, va_list ap); - /* 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 + #define PGM_ATTR PROGMEM #endif #endif + #ifndef __cplusplus + /* + * Disallow some C++ keywords as identifiers in C programs, + * for improved portability. + */ + #pragma GCC poison new delete class template typename + #pragma GCC poison private protected public operator + #pragma GCC poison friend mutable using namespace + #pragma GCC poison cin cout cerr clog + #endif + #elif defined(__MWERKS__) && CPU_DSP56K + /* Compiler features */ + #define COMPILER_TYPEOF 1 + #define COMPILER_STATEMENT_EXPRESSIONS 1 + #include #include #include @@ -207,6 +252,32 @@ #endif +/* Defaults for compiler extensions. */ + +/*! + * \def COMPILER_VARIADIC_MACROS + * Support for macros with variable arguments. + */ +#ifndef COMPILER_HAVE_VARIADIC_MACROS +#define COMPILER_HAVE_VARIADIC_MACROS (COMPILER_C99 != 0) +#endif + +/*! + * \def COMPILER_TYPEOF + * Support for macros with variable arguments. + */ +#ifndef COMPILER_TYPEOF +#define COMPILER_TYPEOF 0 +#endif + +/*! + * \def COMPILER_STATEMENT_EXPRESSIONS + * Support for macros with variable arguments. + */ +#ifndef COMPILER_STATEMENT_EXPRESSIONS +#define COMPILER_STATEMENT_EXPRESSIONS 0 +#endif + /* A few defaults for missing compiler features. */ #ifndef INLINE #define INLINE static inline @@ -220,8 +291,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 */ @@ -235,8 +313,23 @@ #ifndef UNLIKELY #define UNLIKELY(x) x #endif +#ifndef PURE_FUNC +#define PURE_FUNC /* nothing */ +#endif +#ifndef CONST_FUNC +#define CONST_FUNC /* nothing */ +#endif +#ifndef UNUSED_FUNC +#define UNUSED_FUNC /* nothing */ +#endif +#ifndef USED_FUNC +#define USED_FUNC /* nothing */ +#endif #ifndef RESTRICT -#define RESTRICT +#define RESTRICT /* nothing */ +#endif +#ifndef MUST_CHECK +#define MUST_CHECK /* nothing */ #endif /* Support for harvard architectures */ @@ -265,9 +358,11 @@ /* Support for hybrid C/C++ applications. */ #ifdef __cplusplus + #define EXTERN_C extern "C" #define EXTERN_C_BEGIN extern "C" { #define EXTERN_C_END } #else + #define EXTERN_C extern #define EXTERN_C_BEGIN /* nothing */ #define EXTERN_C_END /* nothing */ #endif @@ -357,6 +452,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 */