/*
* $Log$
+ * Revision 1.16 2004/08/14 19:37:57 rasky
+ * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *
+ * Revision 1.15 2004/08/13 03:23:26 bernie
+ * Adjust a few MSVC tweaks from older projects.
+ *
+ * Revision 1.14 2004/08/10 06:56:29 bernie
+ * RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file.
+ *
+ * Revision 1.13 2004/08/02 20:20:29 aleph
+ * Merge from project_ks
+ *
+ * Revision 1.12 2004/08/01 01:21:17 bernie
+ * LIKELY(), UNLIKELY(): New compiler-specific macros.
+ *
+ * Revision 1.11 2004/07/30 14:34:10 rasky
+ * Vari fix per documentazione e commenti
+ * Aggiunte PP_CATn e STATIC_ASSERT
+ *
+ * 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.
*
#define COMPILER_H
#include "arch_config.h"
+#include "cpu_detect.h"
#if defined __GNUC__ && defined __GNUC_MINOR__
#define GNUC_PREREQ(maj, min) 0
#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+ #define COMPILER_C99 1
+#else
+ #define COMPILER_C99 0
+#endif
+
#if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)
#pragma language=extended
#define INTERRUPT(x) interrupt [x]
#include <setjmp.h>
#include <time.h> /* for time_t */
- #define float double
- /* Ouch, ReleaseSemaphore() conflicts with a WIN32 call ;-( */
- #define ReleaseSemaphore KReleaseSemaphore
+ /* FIXME: I can't remember why exactly this was needed (NdBernie) */
+ #define float double
/* Fake bool support */
#ifndef __cplusplus
typedef int bool;
#endif /* !__cplusplus */
+ /* These C99 functions are oddly named in MSVCRT32.lib */
+ #define snprintf _snprintf
+ #define vsnprintf _vsnprintf
+
#elif defined(__GNUC__)
/* GCC attributes */
#define NORETURN __attribute__((__noreturn__))
#define UNUSED(type,arg) __attribute__((__unused__)) type arg
#define INLINE static inline __attribute__((__always_inline__))
+ #define LIKELY(x) __builtin_expect((x), 1)
+ #define UNLIKELY(x) __builtin_expect((x), 0)
+ #define RESTRICT __restrict__
#if GNUC_PREREQ(3,1)
#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>
#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
#ifndef INTERRUPT
#define INTERRUPT(x) ERROR_NOT_IMPLEMENTED
#endif
+#ifndef LIKELY
+#define LIKELY(x) x
+#endif
+#ifndef UNLIKELY
+#define UNLIKELY(x) x
+#endif
+#ifndef RESTRICT
+#define RESTRICT
+#endif
/* Support for harvard architectures */
#ifndef PSTR
#endif
-/* Quasi-ANSI macros */
-#ifndef offsetof
- /*! offsetof(s,m) - Return the byte offset of the member \a m in struct \a s */
- #define offsetof(s,m) (size_t)&(((s *)0)->m)
-#endif
-#ifndef countof
- /*! Count the number of elements in the static array \a a */
- #define countof(a) (sizeof(a) / sizeof(*(a)))
-#endif
-
-
-/* Simple macros */
-#define ABS(a) (((a) < 0) ? -(a) : (a))
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-
-#ifndef BV
-/*! Convert a bit value to a binary flag */
-#define BV(x) (1<<(x))
-#endif
-
-/*! Round up \a x to an even multiple of the 2's power \a pad */
-#define ROUND2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
-
-/*! Calculate a compile-time log2 for a uint8_t */
-#define UINT8_LOG2(x) \
- ((x) < 2 ? 0 : \
- ((x) < 4 ? 1 : \
- ((x) < 8 ? 2 : \
- ((x) < 16 ? 3 : \
- ((x) < 32 ? 4 : \
- ((x) < 64 ? 5 : \
- ((x) < 128 ? 6 : 7)))))))
-
-/*! Calculate a compile-time log2 for a uint16_t */
-#define UINT16_LOG2(x) \
- ((x < 256) ? UINT8_LOG2(x) : UINT8_LOG2((x) >> 8) + 8)
-
-/*! Calculate a compile-time log2 for a uint32_t */
-#define UINT32_LOG2(x) \
- ((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
-
-/*! Concatenate two different preprocessor tokens (allowing macros to expand) */
-#define PP_CAT(x,y) PP_CAT__(x,y)
-#define PP_CAT__(x,y) x ## y
-
-
/*
* Standard type definitions
* These should be in <sys/types.h>, but many compilers lack them.
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
projects / bertos.git / blobdiff