X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=cfg%2Fcompiler.h;h=043272fbbe8412786f989c568012182b2c712bdf;hb=39108834d9c102712d6c11830ca9b9fb5b098d19;hp=ba645190508307cda77ce6eeab3c02c7ee9d3440;hpb=0255004aec6cf62df50b525c7e7d9f4a9380b4d4;p=bertos.git

diff --git a/cfg/compiler.h b/cfg/compiler.h
index ba645190..043272fb 100755
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $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.
  *#*
@@ -85,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 <longjmp.h>. 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
+
+		#define COMPILER_VARIADIC_MACROS 1
+
+		#define INTERRUPT(x)  __irq __arm void x (void)
+		#define REGISTER      register
+		#define INLINE        static inline
 
-	typedef struct _JMP_BUF jmp_buf[1];
+		/* Include some standard C89/C99 stuff */
+		#include <stddef.h>
+		#include <stdbool.h>
 
-	int setjmp(jmp_buf env);
-	void longjmp(jmp_buf env, int val);
+	#else /* CPU_I196 */
 
-	/* Fake bool support */
-	#define true (1==1)
-	#define false (1!=1)
-	typedef unsigned char bool;
+		#define INTERRUPT(x)  interrupt [x]
+		#define REGISTER      shortad
+		#define INLINE        /* unsupported */
+
+		/*
+		 * Imported from <longjmp.h>. 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];
+
+		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 */
 
@@ -213,7 +243,7 @@
 
 /*!
  * \def COMPILER_TYPEOF
- * Support for macros with variable arguments.
+ * Support for dynamic type identification.
  */
 #ifndef COMPILER_TYPEOF
 #define COMPILER_TYPEOF 0
@@ -221,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
@@ -324,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 <inttypes.h>
 #else
-	/* This is the correct location. */
+	/* This is the standard location. */
 	#include <stdint.h>
 #endif
 
@@ -358,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. */