X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=043272fbbe8412786f989c568012182b2c712bdf;hb=9f6832426387c3730bf2c9b6202db9eb8d159f42;hp=af4928ee5aa664d93d1fa32f0783d4ed33b3d487;hpb=9709df52ecba21e4f5acd4b1e2e67ca70ba1af83;p=bertos.git diff --git a/cfg/compiler.h b/cfg/compiler.h index af4928ee..043272fb 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,18 @@ /*#* *#* $Log$ + *#* Revision 1.9 2006/02/10 12:38:00 bernie + *#* Add support for ARM on IAR. + *#* + *#* Revision 1.8 2006/01/16 03:27:49 bernie + *#* Rename sig_t to sigbit_t to avoid clash with POSIX. + *#* + *#* Revision 1.7 2005/11/27 23:33:05 bernie + *#* Drop avr-libc hack for missing stdint.h. + *#* + *#* Revision 1.6 2005/07/19 07:27:31 bernie + *#* Don't use CPU_REG_BITS from cpu.h to avoid circular header dependendy. + *#* *#* Revision 1.5 2005/06/27 21:24:37 bernie *#* ticks_t: New typedef. *#* @@ -82,44 +94,65 @@ #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) + #pragma language=extended - #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. - * This would allow the compiler to place the buffer on an odd address. - * The CPU _should_ be able to perform word accesses to - * unaligned data, but there are *BUGS* in the 80196KC with - * some combinations of opcodes and addressing modes. One of - * these, "ST SP,[?GR]+" is used in the longjmp() implementation - * provided by the IAR compiler ANSI C library. When ?GR contains - * an odd address, surprisingly the CPU will copy the high order - * byte of the source operand (SP) in the low order byte of the - * destination operand (the memory location pointed to by ?GR). - * - * We also need to replace the library setjmp()/longjmp() with - * our own versions because the IAR implementation "forgets" to - * save the contents of local registers (?LR). - */ - struct _JMP_BUF - { - void *sp; /* Stack pointer */ - void *return_addr; /* Return address */ - int lr[6]; /* 6 local registers */ - }; + // IAR has size_t as built-in type, but does not define this symbol. + #define _SIZE_T_DEFINED + + #ifdef CPU_ARM - typedef struct _JMP_BUF jmp_buf[1]; + #define COMPILER_VARIADIC_MACROS 1 - int setjmp(jmp_buf env); - void longjmp(jmp_buf env, int val); + #define INTERRUPT(x) __irq __arm void x (void) + #define REGISTER register + #define INLINE static inline + + /* Include some standard C89/C99 stuff */ + #include + #include + + #else /* CPU_I196 */ + + #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. + * This would allow the compiler to place the buffer on an odd address. + * The CPU _should_ be able to perform word accesses to + * unaligned data, but there are *BUGS* in the 80196KC with + * some combinations of opcodes and addressing modes. One of + * these, "ST SP,[?GR]+" is used in the longjmp() implementation + * provided by the IAR compiler ANSI C library. When ?GR contains + * an odd address, surprisingly the CPU will copy the high order + * byte of the source operand (SP) in the low order byte of the + * destination operand (the memory location pointed to by ?GR). + * + * We also need to replace the library setjmp()/longjmp() with + * our own versions because the IAR implementation "forgets" to + * save the contents of local registers (?LR). + */ + struct _JMP_BUF + { + void *sp; /* Stack pointer */ + void *return_addr; /* Return address */ + int lr[6]; /* 6 local registers */ + }; - /* Fake bool support */ - #define true (1==1) - #define false (1!=1) - typedef unsigned char bool; + typedef struct _JMP_BUF jmp_buf[1]; + + int setjmp(jmp_buf env); + void longjmp(jmp_buf env, int val); + + /* Fake bool support */ + #define true (1==1) + #define false (1!=1) + typedef unsigned char bool; + + #endif /* !CPU_I196 */ #elif defined(_MSC_VER) /* Win32 emulation support */ @@ -160,14 +193,9 @@ #define DEPRECATED __attribute__((__deprecated__)) #endif - #if CPU_AVR - #include - #include - #else - /* Include some standard C89/C99 stuff */ - #include - #include - #endif + /* Include some standard C89/C99 stuff */ + #include + #include #ifndef __cplusplus /* @@ -215,7 +243,7 @@ /*! * \def COMPILER_TYPEOF - * Support for macros with variable arguments. + * Support for dynamic type identification. */ #ifndef COMPILER_TYPEOF #define COMPILER_TYPEOF 0 @@ -223,7 +251,7 @@ /*! * \def COMPILER_STATEMENT_EXPRESSIONS - * Support for macros with variable arguments. + * Support for statement expressions. */ #ifndef COMPILER_STATEMENT_EXPRESSIONS #define COMPILER_STATEMENT_EXPRESSIONS 0 @@ -326,11 +354,8 @@ typedef unsigned long long uint64_t; #endif /* \} */ -#elif defined(__GNUC__) && CPU_AVR - /* avr-libc is weird... (Fixed in avr-libc-1.2, hack to be removed soon) */ - #include #else - /* This is the correct location. */ + /* This is the standard location. */ #include #endif @@ -360,7 +385,7 @@ typedef void * iptr_t; /*! Bulk storage large enough for both pointers to constants or integers. */ typedef const void * const_iptr_t; -typedef unsigned char sig_t; /*!< Type for signal bits. */ +typedef unsigned char sigbit_t; /*!< Type for signal bits. */ typedef unsigned char sigmask_t; /*!< Type for signal masks. */ typedef unsigned char page_t; /*!< Type for banked memory pages. */ @@ -379,22 +404,23 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ * \{ */ #if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_)) - #if CPU_REG_BITS > 32 - /* 64bit. */ + #if CPU_X86 + /* 32bit or 64bit (32bit for _WIN64). */ typedef unsigned long size_t; #else - /* 32bit or 16bit. */ - typedef unsigned int size_t; + #error Unknown CPU #endif #endif #if !(defined(ssize_t) || defined(__ssize_t_defined)) - #if CPU_REG_BITS > 32 - /* 64bit (32bit for _WIN64). */ + #if CPU_X86 + /* 32bit or 64bit (32bit for _WIN64). */ typedef long ssize_t; - #else - /* 32bit or 16bit. */ + #elif CPU_AVR + /* 16bit (missing in avr-libc's sys/types.h). */ typedef int ssize_t; + #else + #error Unknown CPU #endif #endif /*\}*/