X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=0518f4ca86922af92a7ac49d0afb4e110df29381;hb=f78e7b82ce293dabb9695e3656c244b955fbb9d2;hp=dfb32207f20cec9d4967a801189f507470b5e41e;hpb=a5175fd44dd7528960b1216182afb4fe96c4664e;p=bertos.git diff --git a/compiler.h b/compiler.h index dfb32207..0518f4ca 100755 --- a/compiler.h +++ b/compiler.h @@ -1,8 +1,8 @@ /*! * \file * * @@ -15,25 +15,45 @@ /* * $Log$ - * Revision 1.4 2004/06/27 15:20:26 aleph - * Change UNUSED() macro to accept two arguments: type and name; - * Add macro GNUC_PREREQ to detect GCC version during build; - * Some spacing cleanups and typo fix + * Revision 1.18 2004/08/24 16:32:37 bernie + * Document custom types. * - * Revision 1.3 2004/06/06 18:00:39 bernie - * PP_CAT(): New macro. + * 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.2 2004/06/03 11:27:09 bernie - * Add dual-license information. + * 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.1 2004/05/23 17:48:35 bernie - * Add top-level files. + * 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. */ -#ifndef COMPILER_H -#define COMPILER_H +#ifndef DEVLIB_COMPILER_H +#define DEVLIB_COMPILER_H -#include "arch_config.h" +#include "cpu_detect.h" #if defined __GNUC__ && defined __GNUC_MINOR__ @@ -43,17 +63,30 @@ #define GNUC_PREREQ(maj, min) 0 #endif +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) + #define COMPILER_C99 1 +#else + #define COMPILER_C99 0 +#endif + + +/*! 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_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 + #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) #pragma language=extended - #define INTERRUPT(x) interrupt [x] - #define REGISTER shortad - #define ATOMIC monitor - - /* GCC attributes */ - #define FORMAT(type,fmt,first) /* nothing */ - #define NORETURN /* nothing */ - #define UNUSED(type,arg) type arg + #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. @@ -83,54 +116,45 @@ int setjmp(jmp_buf env); void longjmp(jmp_buf env, int val); - #ifndef __cplusplus - #define true 1 - #define false 0 - typedef unsigned char bool; - #endif /* !__cplusplus */ + /* Fake bool support */ + #define true (1==1) + #define false (1!=1) + typedef unsigned char bool; #elif defined(_MSC_VER) /* Win32 emulation support */ #include #include /* for time_t */ - #define float double - - #define REGISTER /* nothing */ - #define INTERRUPT(x) /* nothing */ - - /* GCC attributes */ - #define FORMAT(type,fmt,first) /* nothing */ - #define NORETURN /* nothing */ - #define UNUSED(type,arg) type arg - #define INLINE static inline - #ifdef __cplusplus - extern "C" { - #endif - void SchedulerIdle(void); - #ifdef __cplusplus - } - #endif - - /* 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 #define true 1 #define false 0 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 - //FIXME #define INLINE static inline - #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__)) + #endif - #if defined(__i386__) + #if CPU_X86 /* hack to avoid conflicts with system type */ #define sigset_t system_sigset_t @@ -139,162 +163,158 @@ #include #undef system_sigset_t - #define REGISTER /* nothing */ - #define INTERRUPT(x) /* nothing */ - - #ifdef __cplusplus - extern "C" { - #endif - void SchedulerIdle(void); - #ifdef __cplusplus - } - #endif - - #elif defined(__AVR__) + #elif CPU_AVR #include #include - #define FLASH __attribute__((progmem)) - #define REGISTER /* nothing */ /* 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 */ #ifdef _PROGMEM #define PGM_READ_CHAR(s) pgm_read_byte(s) #define PGM_FUNC(x) x ## _P - #define PGM_ATTR PROGMEM - #else - #define PGM_READ_CHAR(s) (*(s)) - #define PGM_FUNC(x) x - #define PGM_ATTR /*nop*/ + #define PGM_ATTR PROGMEM #endif - #endif /* CPU */ + #endif -#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__)) +#elif defined(__MWERKS__) && CPU_DSP56K #include #include #include #include - #define FLASH /* nothing */ - #define REGISTER /* nothing */ - #define INTERRUPT(x) ERROR_NOT_IMPLEMENTED - #define SCHEDULER_IDLE /* nothing */ - - #define INLINE static inline - - /* GCC attributes */ - #define FORMAT(type,fmt,first) /* nothing */ - #define NORETURN /* nothing */ - #define UNUSED(type,arg) type arg - - /* Support for harvard architectures */ - #define PGM_READ_CHAR(s) (*(s)) - #define PGM_FUNC /* nothing */ - #define PGM_ATTR /* nothing */ - #define PSTR /* nothing */ + // CodeWarrior has size_t as built-in type, but does not define this symbol. + #define _SIZE_T_DEFINED #else #error unknown compiler #endif -/* Misc definitions */ -#ifndef NULL -#define NULL 0 + +/* A few defaults for missing compiler features. */ +#ifndef INLINE +#define INLINE static inline #endif -#ifndef EOF -#define EOF (-1) +#ifndef NORETURN +#define NORETURN /* nothing */ #endif - - -/* Quasi-ANSI macros - * - * offsetof(s,m) - Give the byte offset of the member in struct - * countof(a) - Count the number of elements in the static array - */ -#ifndef offsetof -#define offsetof(s,m) (size_t)&(((s *)0)->m) +#ifndef FORMAT +#define FORMAT(type,fmt,first) /* nothing */ #endif - -#ifndef countof -#define countof(a) (sizeof(a) / sizeof(*(a))) +#ifndef DEPRECATED +#define DEPRECATED /* nothing */ +#endif +#ifndef UNUSED +#define UNUSED(type,arg) type arg +#endif +#ifndef REGISTER +#define REGISTER /* nothing */ +#endif +#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 -/* 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)) - -/*! Convert a bit value to a binary flag */ -#ifndef BV -#define BV(x) (1<<(x)) +/* 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 -/*! Round up \a x to an even multiple of the 2's power \a pad */ -#define ROUND2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1)) -/*! Calculate a compile-time log2 for a uint8_t */ -#define UINT8_LOG2(x) \ - ((x) < 2 ? 0 : \ - ((x) < 4 ? 1 : \ - ((x) < 8 ? 2 : \ - ((x) < 16 ? 3 : \ - ((x) < 32 ? 4 : \ - ((x) < 64 ? 5 : \ - ((x) < 128 ? 6 : 7))))))) +/* Misc definitions */ +#ifndef NULL +#define NULL (void *)0 +#endif +#ifndef EOF +#define EOF (-1) +#endif -/*! Calculate a compile-time log2 for a uint16_t */ -#define UINT16_LOG2(x) \ - ((x < 256) ? UINT8_LOG2(x) : UINT8_LOG2((x) >> 8) + 8) -/*! Calculate a compile-time log2 for a uint32_t */ -#define UINT32_LOG2(x) \ - ((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16) +/* Support for hybrid C/C++ applications. */ +#ifdef __cplusplus + #define EXTERN_C_BEGIN extern "C" { + #define EXTERN_C_END } +#else + #define EXTERN_C_BEGIN /* nothing */ + #define EXTERN_C_END /* nothing */ +#endif -/*! 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 -/* Type definitions - should go in */ +/* + * 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; #endif /* _TIME_T_DEFINED || __time_t_defined */ /*! Storage for pointers and integers */ +/* FIXME: turn this into a typedef? */ #define IPTR void * -typedef long utime_t; -typedef unsigned char sig_t; -typedef unsigned char sigset_t; -typedef unsigned char page_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 */ -/* ISO C99 fixed-size types */ #if (defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) + /*! + * \name ISO C99 fixed-size types + * + * These should be in , but many compilers lack them. + * \{ + */ typedef signed char int8_t; typedef short int int16_t; typedef long int int32_t; typedef unsigned char uint8_t; typedef unsigned short int uint16_t; typedef unsigned long int uint32_t; -#elif defined(__AVR__) -# include + /* \} */ +#elif defined(__GNUC__) && defined(__AVR__) + /* avr-libc is weird... */ + #include #else -# include + /* This is the correct location. */ + #include #endif -#if (defined(__m56800E__) || defined(__m56800__)) +/*! + * \name Types for hardware registers. + * + * Only use these types for registers whose contents can + * be changed asynchronously by external hardware. + * + * \{ + */ +#if CPU_DSP56K /* Registers can be accessed only through 16-bit pointers */ typedef volatile uint16_t reg16_t; #else @@ -302,5 +322,26 @@ typedef unsigned char page_t; typedef volatile uint16_t reg16_t; typedef volatile uint32_t reg32_t; #endif +/*\}*/ + + +/* Quasi-ANSI macros */ +#ifndef offsetof + /*! + * Return the byte offset of the member \a m in struct \a s + * + * \note This macro should be defined in "stddef.h" and is sometimes + * compiler-specific (g++ has a builtin for it). + */ + #define offsetof(s,m) (size_t)&(((s *)0)->m) +#endif +#ifndef countof + /*! + * Count the number of elements in the static array \a a + * + * \note This macro is non-standard, but implmenents a very common idiom + */ + #define countof(a) (sizeof(a) / sizeof(*(a))) +#endif -#endif /* COMPILER_H */ +#endif /* DEVLIB_COMPILER_H */