X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu.h;h=1c8a62f387df5f85d449142958f491d09b84ce8d;hb=c4c18f25df8d88b4dc8a9eb7a63940ea13fd59fa;hp=6042d9e06b42e00fdf184bd292858fc3a6e05d31;hpb=08ac4ac86f50ed36c06abd5dd12109974009fb1a;p=bertos.git diff --git a/cpu.h b/cpu.h index 6042d9e0..1c8a62f3 100755 --- a/cpu.h +++ b/cpu.h @@ -17,6 +17,24 @@ /*#* *#* $Log$ + *#* Revision 1.28 2004/12/31 17:39:41 bernie + *#* Fix documentation. + *#* + *#* Revision 1.27 2004/12/31 17:02:47 bernie + *#* IRQ_SAVE_DISABLE(), IRQ_RESTORE(): Add null stubs for x86. + *#* + *#* Revision 1.26 2004/12/13 12:08:12 bernie + *#* DISABLE_IRQSAVE, ENABLE_IRQRESTORE, DISABLE_INTS, ENABLE_INTS: Remove obsolete macros. + *#* + *#* Revision 1.25 2004/12/08 08:31:02 bernie + *#* CPU_HARVARD: Define to 1 for AVR and DSP56K. + *#* + *#* Revision 1.24 2004/12/08 08:04:13 bernie + *#* Doxygen fixes. + *#* + *#* Revision 1.23 2004/11/16 22:41:58 bernie + *#* Support 64bit CPUs. + *#* *#* Revision 1.22 2004/11/16 21:57:59 bernie *#* CPU_IDLE: Rename from SCHEDULER_IDLE. *#* @@ -60,7 +78,7 @@ #ifndef DEVLIB_CPU_H #define DEVLIB_CPU_H -#include "compiler.h" /* for uintXX_t, PP_CAT3(), PP_STRINGIZE() */ +#include "compiler.h" /* for uintXX_t */ /*! @@ -96,6 +114,8 @@ #define NOP asm volatile ("nop") #define IRQ_DISABLE /* nothing */ #define IRQ_ENABLE /* nothing */ + #define IRQ_SAVE_DISABLE(x) /* nothing */ + #define IRQ_RESTORE(x) /* nothing */ typedef uint32_t cpuflags_t; // FIXME typedef uint32_t cpustack_t; @@ -128,6 +148,7 @@ #define CPU_STACK_GROWS_UPWARD 1 #define CPU_SP_ON_EMPTY_SLOT 0 #define CPU_BYTE_ORDER CPU_BIG_ENDIAN + #define CPU_HARVARD 1 /* Memory is word-addessed in the DSP56K */ #define CPU_BITS_PER_CHAR 16 @@ -178,6 +199,7 @@ #define CPU_STACK_GROWS_UPWARD 0 #define CPU_SP_ON_EMPTY_SLOT 1 #define CPU_BYTE_ORDER CPU_LITTLE_ENDIAN + #define CPU_HARVARD 1 /*! * Initialization value for registers in stack frame. @@ -189,23 +211,17 @@ #endif -/* OBSOLETE NAMES */ -#define DISABLE_INTS IRQ_DISABLE -#define ENABLE_INTS IRQ_ENABLE -#define DISABLE_IRQSAVE(x) IRQ_SAVE_DISABLE(x) -#define ENABLE_IRQRESTORE(x) IRQ_RESTORE(x) - /*! * Execute \a CODE atomically with respect to interrupts. * - * \see ENABLE_IRQSAVE DISABLE_IRQRESTORE + * \see IRQ_SAVE_DISABLE IRQ_RESTORE */ #define ATOMIC(CODE) \ do { \ cpuflags_t __flags; \ - DISABLE_IRQSAVE(__flags); \ + IRQ_SAVE_DISABLE(__flags); \ CODE; \ - ENABLE_IRQRESTORE(__flags); \ + IRQ_RESTORE(__flags); \ } while (0) @@ -290,11 +306,7 @@ /*! - * \name Default type sizes - * - * \def SIZEOF_CHAR SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_PTR - * \def CPU_BITS_PER_CHAR CPU_BITS_PER_SHORT CPU_BITS_PER_INT - * \def CPU_BITS_PER_LONG CPU_BITS_PER_PTR + * \name Default type sizes. * * These defaults are reasonable for most 16/32bit machines. * Some of these macros may be overridden by CPU-specific code above. @@ -327,7 +339,11 @@ #endif /* !SIZEOF_INT */ #ifndef SIZEOF_LONG -#define SIZEOF_LONG 4 +#if CPU_REG_BITS > 32 + #define SIZEOF_LONG 8 +#else + #define SIZEOF_LONG 4 +#endif #endif #ifndef SIZEOF_PTR @@ -363,7 +379,7 @@ STATIC_ASSERT(sizeof(int) == SIZEOF_INT); /*! - * \def SCHEDULER_IDLE + * \def CPU_IDLE * * \brief Invoked by the scheduler to stop the CPU when idle. *