X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu.h;h=d7d5f4e605936674c82bd4588b761157a116bf95;hb=1f9a4aef45e0bf55a31bf88a828ebd867cf32a34;hp=31966d7852a0f5696c81ce7f212e71c82726c110;hpb=9bbc64dbb86de037ca5dd1ff1608a5fae253745f;p=bertos.git diff --git a/cpu.h b/cpu.h index 31966d78..d7d5f4e6 100755 --- a/cpu.h +++ b/cpu.h @@ -15,24 +15,36 @@ * \author Stefano Fedrigo */ -/* - * $Log$ - * Revision 1.14 2004/08/24 13:29:28 bernie - * Trim CVS log; Rename header guards. - * - * Revision 1.12 2004/08/14 19:37:57 rasky - * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc. - * - * Revision 1.11 2004/08/05 17:39:56 bernie - * Fix a Doxygen tag. - * - * Revision 1.10 2004/08/02 20:20:29 aleph - * Merge from project_ks - * - * Revision 1.9 2004/07/30 14:24:16 rasky - * Task switching con salvataggio perfetto stato di interrupt (SR) - * Kernel monitor per dump informazioni su stack dei processi - */ +/*#* + *#* $Log$ + *#* Revision 1.18 2004/10/03 18:36:31 bernie + *#* IRQ_GETSTATE(): New macro; Rename IRQ macros for consistency. + *#* + *#* Revision 1.17 2004/09/06 21:48:27 bernie + *#* ATOMIC(): New macro. + *#* + *#* Revision 1.16 2004/08/29 21:58:33 bernie + *#* Rename BITS_PER_XYZ macros; Add sanity checks. + *#* + *#* Revision 1.15 2004/08/25 14:12:08 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* Revision 1.14 2004/08/24 13:29:28 bernie + *#* Trim CVS log; Rename header guards. + *#* + *#* Revision 1.12 2004/08/14 19:37:57 rasky + *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc. + *#* + *#* Revision 1.11 2004/08/05 17:39:56 bernie + *#* Fix a Doxygen tag. + *#* + *#* Revision 1.10 2004/08/02 20:20:29 aleph + *#* Merge from project_ks + *#* + *#* Revision 1.9 2004/07/30 14:24:16 rasky + *#* Task switching con salvataggio perfetto stato di interrupt (SR) + *#* Kernel monitor per dump informazioni su stack dei processi + *#*/ #ifndef DEVLIB_CPU_H #define DEVLIB_CPU_H @@ -99,19 +111,19 @@ #define CPU_BYTE_ORDER CPU_BIG_ENDIAN /* Memory is word-addessed in the DSP56K */ - #define BITSP_PER_CHAR 16 - #define SIZEOF_SHORT 1 - #define SIZEOF_INT 1 - #define SIZEOF_LONG 2 - #define SIZEOF_PTR 1 + #define CPU_BITS_PER_CHAR 16 + #define SIZEOF_SHORT 1 + #define SIZEOF_INT 1 + #define SIZEOF_LONG 2 + #define SIZEOF_PTR 1 #elif CPU_AVR - #define NOP asm volatile ("nop" ::) - #define DISABLE_INTS asm volatile ("cli" ::) - #define ENABLE_INTS asm volatile ("sei" ::) + #define NOP asm volatile ("nop" ::) + #define IRQ_DISABLE asm volatile ("cli" ::) + #define IRQ_ENABLE asm volatile ("sei" ::) - #define DISABLE_IRQSAVE(x) \ + #define IRQ_SAVE_DISABLE(x) \ do { \ __asm__ __volatile__( \ "in %0,__SREG__\n\t" \ @@ -120,13 +132,29 @@ ); \ } while (0) - #define ENABLE_IRQRESTORE(x) \ + #define IRQ_RESTORE(x) \ do { \ __asm__ __volatile__( \ "out __SREG__,%0" : /* no outputs */ : "r" (x) : "cc" \ ); \ } while (0) + #define IRQ_GETSTATE() \ + ({ \ + uint8_t sreg; \ + __asm__ __volatile__( \ + "in %0,__SREG__\n\t" \ + : "=r" (sreg) /* no inputs & no clobbers */ \ + ); \ + (bool)(sreg & 0x80); \ + }) + + /* 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) + typedef uint8_t cpuflags_t; typedef uint8_t cpustack_t; @@ -148,6 +176,19 @@ #endif +/*! + * Execute \a CODE atomically with respect to interrupts. + * + * \see ENABLE_IRQSAVE DISABLE_IRQRESTORE + */ +#define ATOMIC(CODE) \ + do { \ + cpuflags_t __flags; \ + DISABLE_IRQSAVE(__flags); \ + CODE; \ + ENABLE_IRQRESTORE(__flags); \ + } while (0) + //! Default for macro not defined in the right arch section #ifndef CPU_REG_INIT_VALUE @@ -228,22 +269,23 @@ /*! - * \def SIZEOF_CHAR SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_PTR - * \def BITS_PER_CHAR BITS_PER_SHORT BITS_PER_INT BITS_PER_LONG BITS_PER_PTR + * \name Default type sizes * - * \brief 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 * * These defaults are reasonable for most 16/32bit machines. * Some of these macros may be overridden by CPU-specific code above. * - * ANSI C specifies that the following equations must be true: + * ANSI C requires that the following equations be true: * \code * sizeof(char) <= sizeof(short) <= sizeof(int) <= sizeof(long) * sizeof(float) <= sizeof(double) - * BITS_PER_CHAR >= 8 - * BITS_PER_SHORT >= 8 - * BITS_PER_INT >= 16 - * BITS_PER_LONG >= 32 + * CPU_BITS_PER_CHAR >= 8 + * CPU_BITS_PER_SHORT >= 8 + * CPU_BITS_PER_INT >= 16 + * CPU_BITS_PER_LONG >= 32 * \end code * \{ */ @@ -271,27 +313,33 @@ #define SIZEOF_PTR SIZEOF_INT #endif -#ifndef BITS_PER_CHAR -#define BITS_PER_CHAR (SIZEOF_CHAR * 8) +#ifndef CPU_BITS_PER_CHAR +#define CPU_BITS_PER_CHAR (SIZEOF_CHAR * 8) #endif -#ifndef BITS_PER_SHORT -#define BITS_PER_SHORT (SIZEOF_SHORT * BITS_PER_CHAR) +#ifndef CPU_BITS_PER_SHORT +#define CPU_BITS_PER_SHORT (SIZEOF_SHORT * CPU_BITS_PER_CHAR) #endif -#ifndef BITS_PER_INT -#define BITS_PER_INT (SIZEOF_INT * BITS_PER_CHAR) +#ifndef CPU_BITS_PER_INT +#define CPU_BITS_PER_INT (SIZEOF_INT * CPU_BITS_PER_CHAR) #endif -#ifndef BITS_PER_LONG -#define BITS_PER_LONG (SIZEOF_LONG * BITS_PER_CHAR) +#ifndef CPU_BITS_PER_LONG +#define CPU_BITS_PER_LONG (SIZEOF_LONG * CPU_BITS_PER_CHAR) #endif -#ifndef BITS_PER_PTR -#define BITS_PER_PTR (SIZEOF_PTR * BITS_PER_CHAR) +#ifndef CPU_BITS_PER_PTR +#define CPU_BITS_PER_PTR (SIZEOF_PTR * CPU_BITS_PER_CHAR) #endif /*\}*/ +/* Sanity checks for the above definitions */ +STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR); +STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT); +STATIC_ASSERT(sizeof(long) == SIZEOF_LONG); +STATIC_ASSERT(sizeof(int) == SIZEOF_INT); + /*! * \def SCHEDULER_IDLE