X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=d4e7e7b182014db97e0a11d56f8de014dd5395ab;hb=ef9091677fa3d4fb9f903fcb5debe52d5b52a8cf;hp=bf9ae35c6b7537fcc0af7aea27d61ce8f6cced5a;hpb=218e4428411094ac785e00a719c7d84337dfdd1c;p=bertos.git diff --git a/cfg/compiler.h b/cfg/compiler.h index bf9ae35c..d4e7e7b1 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,12 @@ /*#* *#* $Log$ + *#* Revision 1.10 2006/02/15 09:12:01 bernie + *#* Fixes for ARM/IAR support. + *#* + *#* 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. *#* @@ -91,44 +97,67 @@ #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 */ - }; + #if CPU_ARM + + #define COMPILER_VARIADIC_MACROS 1 + + #define INTERRUPT(x) __irq __arm void x (void) + #define INLINE static inline + + /* Include some standard C89/C99 stuff */ + #include + #include + #include + + #elif CPU_I196 + + // IAR has size_t as built-in type, but does not define this symbol. + #define _SIZE_T_DEFINED + + #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 */ + }; - typedef struct _JMP_BUF jmp_buf[1]; + typedef struct _JMP_BUF jmp_buf[1]; - int setjmp(jmp_buf env); - void longjmp(jmp_buf env, int val); + 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; + /* Fake bool support */ + #define true (1==1) + #define false (1!=1) + typedef unsigned char bool; + + #else + #error Unsupported CPU + #endif #elif defined(_MSC_VER) /* Win32 emulation support */ @@ -171,6 +200,7 @@ /* Include some standard C89/C99 stuff */ #include + #include #include #ifndef __cplusplus @@ -195,8 +225,8 @@ #define UNUSED_ARG(type,arg) type - #include #include + #include #include // CodeWarrior has size_t as built-in type, but does not define this symbol. @@ -219,7 +249,7 @@ /*! * \def COMPILER_TYPEOF - * Support for macros with variable arguments. + * Support for dynamic type identification. */ #ifndef COMPILER_TYPEOF #define COMPILER_TYPEOF 0 @@ -227,7 +257,7 @@ /*! * \def COMPILER_STATEMENT_EXPRESSIONS - * Support for macros with variable arguments. + * Support for statement expressions. */ #ifndef COMPILER_STATEMENT_EXPRESSIONS #define COMPILER_STATEMENT_EXPRESSIONS 0 @@ -301,18 +331,21 @@ #define EXTERN_C extern "C" #define EXTERN_C_BEGIN extern "C" { #define EXTERN_C_END } + #define EXTERN_CONST extern const #else #define EXTERN_C extern #define EXTERN_C_BEGIN /* nothing */ #define EXTERN_C_END /* nothing */ + #define EXTERN_CONST const #endif -#if (defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) +#if defined(_MSC_VER) + || ((defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) && CPU_I196) /*! * \name ISO C99 fixed-size types * - * These should be in , but many compilers lack them. + * These should be in , but a few compilers lack them. * \{ */ typedef signed char int8_t; @@ -376,10 +409,12 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ * * glibc, avr-libc: _SIZE_T_DEFINED * Darwin libc: _BSD_SIZE_T_DEFINED_ + * IAR ARM: _SIZE_T * * \{ */ -#if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_)) +#if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_) \ + || defined(_SIZE_T)) #if CPU_X86 /* 32bit or 64bit (32bit for _WIN64). */ typedef unsigned long size_t; @@ -392,6 +427,8 @@ typedef unsigned char page_t; /*!< Type for banked memory pages. */ #if CPU_X86 /* 32bit or 64bit (32bit for _WIN64). */ typedef long ssize_t; + #elif CPU_ARM + typedef int ssize_t; #elif CPU_AVR /* 16bit (missing in avr-libc's sys/types.h). */ typedef int ssize_t;