X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=9acdfccc85b7e5fd80d6c50b012d691c337e0d53;hb=de2caf08ef2eca066c3d5a40ab91d7f34c3f555e;hp=9496481d0bdea5bd81d9a3716086f8c2e738c141;hpb=52931926d11b65b932c7c5f55ce4566439d4593c;p=bertos.git diff --git a/compiler.h b/compiler.h index 9496481d..9acdfccc 100755 --- a/compiler.h +++ b/compiler.h @@ -15,6 +15,32 @@ /* * $Log$ + * 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.8 2004/07/20 23:43:39 bernie + * Use attribute((always_inline)) to force inlining. This fixes the much + * hated need of redundant prototypes for inline functions. + * * Revision 1.7 2004/07/20 23:26:48 bernie * Fix two errors introduced by previous commit. * @@ -43,6 +69,7 @@ #define COMPILER_H #include "arch_config.h" +#include "cpu_detect.h" #if defined __GNUC__ && defined __GNUC_MINOR__ @@ -95,10 +122,9 @@ #include #include /* for time_t */ - #define float double - /* Ouch, ReleaseSemaphore() conflicts with a WIN32 call ;-( */ - #define ReleaseSemaphore KReleaseSemaphore + /* FIXME: I can't remember why exactly this was needed (NdBernie) */ + #define float double /* Fake bool support */ #ifndef __cplusplus @@ -107,18 +133,25 @@ typedef int bool; #endif /* !__cplusplus */ + /* These C99 functions are oddly named in MSVCRT32.lib */ + #define snprintf _snprintf + #define vsnprintf _vsnprintf + #elif defined(__GNUC__) /* 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 INLINE extern inline + #define INLINE static inline __attribute__((__always_inline__)) + #define LIKELY(x) __builtin_expect((x), 1) + #define UNLIKELY(x) __builtin_expect((x), 0) + #define RESTRICT __restrict__ #if GNUC_PREREQ(3,1) - #define DEPRECATED __attribute__((__deprecated__)) + #define DEPRECATED __attribute__((__deprecated__)) #endif - #if defined(__i386__) + #if CPU_X86 /* hack to avoid conflicts with system type */ #define sigset_t system_sigset_t @@ -127,7 +160,7 @@ #include #undef system_sigset_t - #elif defined(__AVR__) + #elif CPU_AVR #include #include @@ -135,9 +168,6 @@ /* Missing printf-family functions in avr-libc/stdio.h */ #include #include - #if !GNUC_PREREQ(3,4) - int vsprintf(char *buf, const char *fmt, va_list ap); - #endif int vsprintf_P(char *buf, const char * PROGMEM fmt, va_list ap); /* Support for harvard architectures */ @@ -147,15 +177,18 @@ #define PGM_ATTR PROGMEM #endif - #endif /* CPU */ + #endif -#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__)) +#elif defined(__MWERKS__) && CPU_DSP56K #include #include #include #include + // CodeWarrior has size_t as built-in type, but does not define this symbol. + #define _SIZE_T_DEFINED + #else #error unknown compiler #endif @@ -183,6 +216,15 @@ #ifndef INTERRUPT #define INTERRUPT(x) ERROR_NOT_IMPLEMENTED #endif +#ifndef LIKELY +#define LIKELY(x) x +#endif +#ifndef UNLIKELY +#define UNLIKELY(x) x +#endif +#ifndef RESTRICT +#define RESTRICT +#endif /* Support for harvard architectures */ #ifndef PSTR @@ -230,9 +272,29 @@ /* Simple macros */ -#define ABS(a) (((a) < 0) ? -(a) : (a)) -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) +#if GNUC_PREREQ(2,0) + #define ABS(n) ({ \ + __typeof__(n) _n = (n); \ + (_n < 0) ? -_n : _n; \ + }) + #define MIN(a,b) ({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + (void)(&_a == &_b); /* ensure same type */ \ + (_a < _b) ? _a : _b; \ + }) + #define MAX(a,b) ({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + (void)(&_a == &_b); /* ensure same type */ \ + (_a > _b) ? _a : _b; \ + }) +#else /* !GNUC */ + /* Buggy macros for inferior compilers */ + #define ABS(a) (((a) < 0) ? -(a) : (a)) + #define MIN(a,b) (((a) < (b)) ? (a) : (b)) + #define MAX(a,b) (((a) > (b)) ? (a) : (b)) +#endif /* !GNUC */ #ifndef BV /*! Convert a bit value to a binary flag */ @@ -261,16 +323,27 @@ ((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16) /*! Concatenate two different preprocessor tokens (allowing macros to expand) */ -#define PP_CAT(x,y) PP_CAT__(x,y) -#define PP_CAT__(x,y) x ## y +#define PP_CAT(x,y) PP_CAT__(x,y) +#define PP_CAT__(x,y) x ## y +#define PP_CAT3(x,y,z) PP_CAT(PP_CAT(x,y),z) +#define PP_CAT4(x,y,z,w) PP_CAT(PP_CAT3(x,y,z),w) +#define PP_CAT5(x,y,z,w,j) PP_CAT(PP_CAT4(x,y,z,w),j) + +/*! String-ize a token (allowing macros to expand) */ +#define PP_STRINGIZE(x) PP_STRINGIZE__(x) +#define PP_STRINGIZE__(x) #x +/*! Issue a compilation error if the \a condition is false */ +#define STATIC_ASSERT(condition) \ + extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1] /* * Standard type definitions * These should be in , but many compilers lack them. */ #if !(defined(size_t) || defined(_SIZE_T_DEFINED)) - #define size_t unsigned int + typedef unsigned int size_t; + typedef int ssize_t; #endif #if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined)) typedef long time_t; @@ -296,6 +369,7 @@ typedef unsigned char page_t; typedef unsigned short int uint16_t; typedef unsigned long int uint32_t; #elif defined(__AVR__) + /* TODO: should this detect GCC+AVR combo, or just CPU_AVR? */ /* avr-libc is weird... */ #include #else @@ -311,7 +385,7 @@ typedef unsigned char page_t; * * \{ */ -#if (defined(__m56800E__) || defined(__m56800__)) +#if CPU_DSP56K /* Registers can be accessed only through 16-bit pointers */ typedef volatile uint16_t reg16_t; #else