X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=cfde70820895faeb4ce9ba858a90052720afbc6e;hb=6f109b7b3511411231a36425dd3aade65c68de1d;hp=d7814160bc10b21be9c99c22c79896687691aaca;hpb=fde50a18a7aa9d24f121882346f00585df589deb;p=bertos.git diff --git a/compiler.h b/compiler.h index d7814160..cfde7082 100755 --- a/compiler.h +++ b/compiler.h @@ -14,6 +14,21 @@ /*#* *#* $Log$ + *#* Revision 1.40 2005/01/20 18:46:04 aleph + *#* Add progmem datatypes; PSTR() definition. + *#* + *#* Revision 1.39 2005/01/08 08:49:39 bernie + *#* Define PROGMEM on AVR only when not including pgmspace.h. + *#* + *#* Revision 1.38 2004/12/31 16:41:52 bernie + *#* PROGMEM: Define to nothing for non-Harvard processors. + *#* + *#* Revision 1.37 2004/12/08 09:43:21 bernie + *#* Metrowerks supports variadic macros. + *#* + *#* Revision 1.36 2004/12/08 08:55:54 bernie + *#* Rename sigset_t to sigmask_t and time_t to mtime_t, to avoid conflicts with POSIX definitions. + *#* *#* Revision 1.35 2004/12/08 07:35:51 bernie *#* Typo in macro name. *#* @@ -114,6 +129,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 @@ -139,7 +159,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 @@ -157,9 +178,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]; @@ -175,15 +196,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 */ @@ -219,12 +239,9 @@ #if CPU_X86 - /* Hack to avoid conflicts with system type */ - #define sigset_t system_sigset_t #include #include #include - #undef system_sigset_t #elif CPU_AVR @@ -233,9 +250,14 @@ /* Support for harvard architectures */ #ifdef _PROGMEM + #include #define PGM_READ_CHAR(s) pgm_read_byte(s) #define PGM_FUNC(x) x ## _P #define PGM_ATTR PROGMEM + #else + /* We still need this for prototypes */ + #define PROGMEM __attribute__((__progmem__)) + #define PSTR(s) ({static char __c[] PROGMEM = (s); __c;}) #endif #endif @@ -254,6 +276,7 @@ #elif defined(__MWERKS__) && CPU_DSP56K /* Compiler features */ + #define COMPILER_VARIADIC_MACROS 1 #define COMPILER_TYPEOF 1 #define COMPILER_STATEMENT_EXPRESSIONS 1 @@ -322,6 +345,9 @@ #ifndef REGISTER #define REGISTER /* nothing */ #endif +#ifndef PROGMEM +#define PROGMEM /* nothing */ +#endif #ifndef INTERRUPT #define INTERRUPT(x) ERROR_NOT_IMPLEMENTED #endif @@ -364,7 +390,6 @@ #define PGM_ATTR /* nothing */ #endif - /* Misc definitions */ #ifndef NULL #define NULL (void *)0 @@ -408,6 +433,17 @@ #include #endif +/*! + * \name Types for variables stored in program memory (harvard processors). + * \{ + */ +typedef PROGMEM int8_t pgm_int8_t; +typedef PROGMEM uint8_t pgm_uint8_t; +typedef PROGMEM int16_t pgm_int16_t; +typedef PROGMEM uint16_t pgm_uint16_t; +typedef PROGMEM int32_t pgm_int32_t; +typedef PROGMEM uint32_t pgm_uint32_t; +/*\}*/ #if CPU_AVR_ATMEGA8 /* @@ -430,7 +466,7 @@ typedef void * iptr_t; typedef const void * const_iptr_t; typedef unsigned char sig_t; /*!< Type for signal bits. */ -typedef unsigned char sigset_t; /*!< Type for signal masks. */ +typedef unsigned char sigmask_t; /*!< Type for signal masks. */ typedef unsigned char page_t; /*!< Type for banked memory pages. */ @@ -453,7 +489,7 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ #endif #endif -#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined)) +#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