/*
* $Log$
+ * 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.
+ *
* Revision 1.8 2004/07/20 23:43:39 bernie
* Use attribute((always_inline)) to force inlining. This fixes the much
* hated need of redundant prototypes for inline functions.
#define COMPILER_H
#include "arch_config.h"
+#include "cpu_detect.h"
#if defined __GNUC__ && defined __GNUC_MINOR__
#define DEPRECATED __attribute__((__deprecated__))
#endif
- #if defined(__i386__)
+ #if CPU_X86
/* hack to avoid conflicts with system type */
#define sigset_t system_sigset_t
#include <stdbool.h>
#undef system_sigset_t
- #elif defined(__AVR__)
+ #elif CPU_AVR
#include <stddef.h>
#include <stdbool.h>
/* Missing printf-family functions in avr-libc/stdio.h */
#include <stdarg.h>
#include <avr/pgmspace.h>
- #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 */
#define PGM_ATTR PROGMEM
#endif
- #endif /* CPU */
+ #endif
-#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__))
+#elif defined(__MWERKS__) && CPU_DSP56K
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#include <setjmp.h>
+ // CodeWarrior has size_t as built-in type, but does not define this symbol.
+ #define _SIZE_T_DEFINED
+
#else
#error unknown compiler
#endif
* These should be in <sys/types.h>, 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;
typedef unsigned short int uint16_t;
typedef unsigned long int uint32_t;
#elif defined(__AVR__)
+ /* TODO: should this detect GCC+AVR combo, or just CPU_AVR? */
/* avr-libc is weird... */
#include <inttypes.h>
#else
*
* \{
*/
-#if (defined(__m56800E__) || defined(__m56800__))
+#if CPU_DSP56K
/* Registers can be accessed only through 16-bit pointers */
typedef volatile uint16_t reg16_t;
#else