Move cpu.h to cpu/.
authorbatt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Thu, 11 Oct 2007 14:11:46 +0000 (14:11 +0000)
committerbatt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Thu, 11 Oct 2007 14:11:46 +0000 (14:11 +0000)
git-svn-id: https://src.develer.com/svnoss/bertos/trunk@850 38d2e660-2303-0410-9eaa-f027e97ec537

cfg/cpu.h [deleted file]
cpu/cpu.h

diff --git a/cfg/cpu.h b/cfg/cpu.h
deleted file mode 100644 (file)
index 8a94572..0000000
--- a/cfg/cpu.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2004 Giovanni Bajo
- *
- * -->
- *
- * \brief CPU-specific definitions
- *
- * \author Giovanni Bajo <rasky@develer.com>
- * \author Bernardo Innocenti <bernie@develer.com>
- * \author Stefano Fedrigo <aleph@develer.com>
- */
-#ifndef DEVLIB_CPU_H
-#define DEVLIB_CPU_H
-
-#include <cfg/compiler.h> /* for uintXX_t */
-#include <cfg/arch_config.h>  /* ARCH_EMUL */
-
-
-/**
- * \name Macros for determining CPU endianness.
- * \{
- */
-#define CPU_BIG_ENDIAN    0x1234
-#define CPU_LITTLE_ENDIAN 0x3412 /* Look twice, pal. This is not a bug. */
-/*\}*/
-
-/** Macro to include cpu-specific versions of the headers. */
-#define CPU_HEADER(module)          PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).h)
-
-/** Macro to include cpu-specific versions of implementation files. */
-#define CPU_CSOURCE(module)         PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).c)
-
-
-#if CPU_I196
-
-       #define NOP                     nop_instruction()
-       #define IRQ_DISABLE             disable_interrupt()
-       #define IRQ_ENABLE              enable_interrupt()
-
-       typedef uint16_t cpuflags_t; // FIXME
-       typedef unsigned int cpustack_t;
-
-       #define CPU_REG_BITS            16
-       #define CPU_REGS_CNT            16
-       #define CPU_STACK_GROWS_UPWARD  0
-       #define CPU_SP_ON_EMPTY_SLOT    0
-       #define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
-       #define CPU_HARVARD             0
-
-#elif CPU_X86
-
-       #define NOP                     asm volatile ("nop")
-
-       /* Get IRQ_* definitions from the hosting environment. */
-       #include <cfg/os.h>
-       #if OS_EMBEDDED
-               #define IRQ_DISABLE             FIXME
-               #define IRQ_ENABLE              FIXME
-               #define IRQ_SAVE_DISABLE(x)     FIXME
-               #define IRQ_RESTORE(x)          FIXME
-               typedef uint32_t cpuflags_t; // FIXME
-       #endif /* OS_EMBEDDED */
-
-
-       #define CPU_REGS_CNT            7
-       #define CPU_SAVED_REGS_CNT      7
-       #define CPU_STACK_GROWS_UPWARD  0
-       #define CPU_SP_ON_EMPTY_SLOT    0
-       #define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
-       #define CPU_HARVARD             0
-
-       #if CPU_X86_64
-               typedef uint64_t cpustack_t;
-               #define CPU_REG_BITS    64
-
-               #ifdef __WIN64__
-                       /* WIN64 is an IL32-P64 weirdo. */
-                       #define SIZEOF_LONG  4
-               #endif
-       #else
-               typedef uint32_t cpustack_t;
-               #define CPU_REG_BITS    32
-       #endif
-
-#elif CPU_ARM
-
-       typedef uint32_t cpuflags_t;
-       typedef uint32_t cpustack_t;
-
-       /* Register counts include SREG too */
-       #define CPU_REG_BITS           32
-       #define CPU_REGS_CNT           16
-       #define CPU_SAVED_REGS_CNT     FIXME
-       #define CPU_STACK_GROWS_UPWARD 0
-       #define CPU_SP_ON_EMPTY_SLOT   0
-       #define CPU_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
-       #define CPU_HARVARD            0
-
-       #ifdef __IAR_SYSTEMS_ICC__
-
-               #include <inarm.h>
-
-               #if __CPU_MODE__ == 1 /* Thumb */
-                       /* Use stubs */
-                       extern cpuflags_t get_CPSR(void);
-                       extern void set_CPSR(cpuflags_t flags);
-               #else
-                       #define get_CPSR __get_CPSR
-                       #define set_CPSR __set_CPSR
-               #endif
-
-               #define NOP         __no_operation()
-               #define IRQ_DISABLE __disable_interrupt()
-               #define IRQ_ENABLE  __enable_interrupt()
-
-               #define IRQ_SAVE_DISABLE(x) \
-               do { \
-                       (x) = get_CPSR(); \
-                       __disable_interrupt(); \
-               } while (0)
-
-               #define IRQ_RESTORE(x) \
-               do { \
-                       set_CPSR(x); \
-               } while (0)
-
-               #define IRQ_GETSTATE() \
-                       ((bool)(get_CPSR() & 0xb0))
-
-               #define BREAKPOINT  /* asm("bkpt 0") DOES NOT WORK */
-
-       #else /* !__IAR_SYSTEMS_ICC__ */
-
-               #warning "IRQ_ macros need testing!"
-               #warning "Test now or die :-)"
-
-               #define NOP         asm volatile ("mov r0,r0" ::)
-
-               #define IRQ_DISABLE \
-               do { \
-                       asm volatile ( \
-                               "mrs r0, cpsr\n\t" \
-                               "orr r0, r0, #0xc0\n\t" \
-                               "msr cpsr_c, r0" \
-                               ::: "r0" \
-                       ); \
-               } while (0)
-
-               #define IRQ_ENABLE \
-               do { \
-                       asm volatile ( \
-                               "mrs r0, cpsr\n\t" \
-                               "bic r0, r0, #0xc0\n\t" \
-                               "msr cpsr_c, r0" \
-                               ::: "r0" \
-                       ); \
-               } while (0)
-
-               #define IRQ_SAVE_DISABLE(x) \
-               do { \
-                       asm volatile ( \
-                               "mrs %0, cpsr\n\t" \
-                               "orr r0, %0, #0xc0\n\t" \
-                               "msr cpsr_c, r0" \
-                               : "=r" (x) \
-                               : /* no inputs */ \
-                               : "r0" \
-                       ); \
-               } while (0)
-
-               #define IRQ_RESTORE(x) \
-               do { \
-                       asm volatile ( \
-                               "msr cpsr_c, %0" \
-                               : /* no outputs */ \
-                               : "r" (x) \
-                       ); \
-               } while (0)
-
-               #define IRQ_GETSTATE() \
-               ({ \
-                       uint32_t sreg; \
-                       asm volatile ( \
-                               "mrs %0, cpsr\n\t" \
-                               : "=r" (sreg) \
-                               : /* no inputs */ \
-                       ); \
-                       !((sreg & 0xc0) == 0xc0); \
-               })
-
-       #endif /* !__IAR_SYSTEMS_ICC_ */
-
-#elif CPU_PPC
-       #define NOP                 asm volatile ("nop" ::)
-
-       #define IRQ_DISABLE         FIXME
-       #define IRQ_ENABLE          FIXME
-       #define IRQ_SAVE_DISABLE(x) FIXME
-       #define IRQ_RESTORE(x)      FIXME
-       #define IRQ_GETSTATE()      FIXME
-
-       typedef uint32_t cpuflags_t; // FIXME
-       typedef uint32_t cpustack_t; // FIXME
-
-       /* Register counts include SREG too */
-       #define CPU_REG_BITS           (CPU_PPC32 ? 32 : 64)
-       #define CPU_REGS_CNT           FIXME
-       #define CPU_SAVED_REGS_CNT     FIXME
-       #define CPU_STACK_GROWS_UPWARD 0  //FIXME
-       #define CPU_SP_ON_EMPTY_SLOT   0  //FIXME
-       #define CPU_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
-       #define CPU_HARVARD            0
-
-#elif CPU_DSP56K
-
-       #define NOP                     asm(nop)
-       #define BREAKPOINT              asm(debug)
-       #define IRQ_DISABLE             do { asm(bfset #0x0200,SR); asm(nop); } while (0)
-       #define IRQ_ENABLE              do { asm(bfclr #0x0200,SR); asm(nop); } while (0)
-
-       #define IRQ_SAVE_DISABLE(x)  \
-               do { (void)x; asm(move SR,x); asm(bfset #0x0200,SR); } while (0)
-       #define IRQ_RESTORE(x)  \
-               do { (void)x; asm(move x,SR); } while (0)
-
-       static inline bool irq_running(void)
-       {
-               extern void *user_sp;
-               return !!user_sp;
-       }
-       #define IRQ_RUNNING() irq_running()
-
-       static inline bool irq_getstate(void)
-       {
-               uint16_t x;
-               asm(move SR,x);
-               return !(x & 0x0200);
-       }
-       #define IRQ_GETSTATE() irq_getstate()
-
-       typedef uint16_t cpuflags_t;
-       typedef unsigned int cpustack_t;
-
-       #define CPU_REG_BITS            16
-       #define CPU_REGS_CNT            FIXME
-       #define CPU_SAVED_REGS_CNT      8
-       #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
-       #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 IRQ_DISABLE   asm volatile ("cli" ::)
-       #define IRQ_ENABLE    asm volatile ("sei" ::)
-
-       #define IRQ_SAVE_DISABLE(x) \
-       do { \
-               __asm__ __volatile__( \
-                       "in %0,__SREG__\n\t" \
-                       "cli" \
-                       : "=r" (x) : /* no inputs */ : "cc" \
-               ); \
-       } while (0)
-
-       #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); \
-       })
-
-       typedef uint8_t cpuflags_t;
-       typedef uint8_t cpustack_t;
-
-       /* Register counts include SREG too */
-       #define CPU_REG_BITS            8
-       #define CPU_REGS_CNT           33
-       #define CPU_SAVED_REGS_CNT     19
-       #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.
-        * The register index is not directly corrispondent to CPU
-        * register numbers. Index 0 is the SREG register: the initial
-        * value is all 0 but the interrupt bit (bit 7).
-        */
-       #define CPU_REG_INIT_VALUE(reg) (reg == 0 ? 0x80 : 0)
-
-#else
-       #error No CPU_... defined.
-#endif
-
-/**
- * Execute \a CODE atomically with respect to interrupts.
- *
- * \see IRQ_SAVE_DISABLE IRQ_RESTORE
- */
-#define ATOMIC(CODE) \
-       do { \
-               cpuflags_t __flags; \
-               IRQ_SAVE_DISABLE(__flags); \
-               CODE; \
-               IRQ_RESTORE(__flags); \
-       } while (0)
-
-
-/// Default for macro not defined in the right arch section
-#ifndef CPU_REG_INIT_VALUE
-       #define CPU_REG_INIT_VALUE(reg)     0
-#endif
-
-
-#ifndef CPU_STACK_GROWS_UPWARD
-       #error CPU_STACK_GROWS_UPWARD should have been defined to either 0 or 1
-#endif
-
-#ifndef CPU_SP_ON_EMPTY_SLOT
-       #error CPU_SP_ON_EMPTY_SLOT should have been defined to either 0 or 1
-#endif
-
-/*
- * Support stack handling peculiarities of a few CPUs.
- *
- * Most processors let their stack grow downward and
- * keep SP pointing at the last pushed value.
- */
-#if !CPU_STACK_GROWS_UPWARD
-       #if !CPU_SP_ON_EMPTY_SLOT
-               /* Most microprocessors (x86, m68k...) */
-               #define CPU_PUSH_WORD(sp, data) \
-                       do { *--(sp) = (data); } while (0)
-               #define CPU_POP_WORD(sp) \
-                       (*(sp)++)
-       #else
-               /* AVR insanity */
-               #define CPU_PUSH_WORD(sp, data) \
-                       do { *(sp)-- = (data); } while (0)
-               #define CPU_POP_WORD(sp) \
-                       (*++(sp))
-       #endif
-
-#else /* CPU_STACK_GROWS_UPWARD */
-
-       #if !CPU_SP_ON_EMPTY_SLOT
-               /* DSP56K and other weirdos */
-               #define CPU_PUSH_WORD(sp, data) \
-                       do { *++(sp) = (cpustack_t)(data); } while (0)
-               #define CPU_POP_WORD(sp) \
-                       (*(sp)--)
-       #else
-               #error I bet you cannot find a CPU like this
-       #endif
-#endif
-
-
-#if CPU_DSP56K
-       /*
-        * DSP56k pushes both PC and SR to the stack in the JSR instruction, but
-        * RTS discards SR while returning (it does not restore it). So we push
-        * 0 to fake the same context.
-        */
-       #define CPU_PUSH_CALL_CONTEXT(sp, func) \
-               do { \
-                       CPU_PUSH_WORD((sp), (func)); \
-                       CPU_PUSH_WORD((sp), 0x100); \
-               } while (0);
-
-#elif CPU_AVR
-       /*
-        * In AVR, the addresses are pushed into the stack as little-endian, while
-        * memory accesses are big-endian (actually, it's a 8-bit CPU, so there is
-        * no natural endianess).
-        */
-       #define CPU_PUSH_CALL_CONTEXT(sp, func) \
-               do { \
-                       uint16_t funcaddr = (uint16_t)(func); \
-                       CPU_PUSH_WORD((sp), funcaddr); \
-                       CPU_PUSH_WORD((sp), funcaddr>>8); \
-               } while (0)
-
-#else
-       #define CPU_PUSH_CALL_CONTEXT(sp, func) \
-               CPU_PUSH_WORD((sp), (cpustack_t)(func))
-#endif
-
-
-/**
- * \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.
- *
- * ANSI C requires that the following equations be true:
- * \code
- *   sizeof(char) <= sizeof(short) <= sizeof(int) <= sizeof(long)
- *   sizeof(float) <= sizeof(double)
- *   CPU_BITS_PER_CHAR  >= 8
- *   CPU_BITS_PER_SHORT >= 8
- *   CPU_BITS_PER_INT   >= 16
- *   CPU_BITS_PER_LONG  >= 32
- * \endcode
- * \{
- */
-#ifndef SIZEOF_CHAR
-#define SIZEOF_CHAR  1
-#endif
-
-#ifndef SIZEOF_SHORT
-#define SIZEOF_SHORT  2
-#endif
-
-#ifndef SIZEOF_INT
-#if CPU_REG_BITS < 32
-       #define SIZEOF_INT  2
-#else
-       #define SIZEOF_INT  4
-#endif
-#endif /* !SIZEOF_INT */
-
-#ifndef SIZEOF_LONG
-#if CPU_REG_BITS > 32
-       #define SIZEOF_LONG  8
-#else
-       #define SIZEOF_LONG  4
-#endif
-#endif
-
-#ifndef SIZEOF_PTR
-#if CPU_REG_BITS < 32
-       #define SIZEOF_PTR   2
-#elif CPU_REG_BITS == 32
-       #define SIZEOF_PTR   4
-#else /* CPU_REG_BITS > 32 */
-       #define SIZEOF_PTR   8
-#endif
-#endif
-
-#ifndef CPU_BITS_PER_CHAR
-#define CPU_BITS_PER_CHAR   (SIZEOF_CHAR * 8)
-#endif
-
-#ifndef CPU_BITS_PER_SHORT
-#define CPU_BITS_PER_SHORT  (SIZEOF_SHORT * CPU_BITS_PER_CHAR)
-#endif
-
-#ifndef CPU_BITS_PER_INT
-#define CPU_BITS_PER_INT    (SIZEOF_INT * CPU_BITS_PER_CHAR)
-#endif
-
-#ifndef CPU_BITS_PER_LONG
-#define CPU_BITS_PER_LONG   (SIZEOF_LONG * CPU_BITS_PER_CHAR)
-#endif
-
-#ifndef CPU_BITS_PER_PTR
-#define CPU_BITS_PER_PTR    (SIZEOF_PTR * CPU_BITS_PER_CHAR)
-#endif
-
-#ifndef BREAKPOINT
-#define BREAKPOINT /* nop */
-#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);
-STATIC_ASSERT(sizeof(void *) == SIZEOF_PTR);
-STATIC_ASSERT(sizeof(int8_t) * CPU_BITS_PER_CHAR == 8);
-STATIC_ASSERT(sizeof(uint8_t) * CPU_BITS_PER_CHAR == 8);
-STATIC_ASSERT(sizeof(int16_t) * CPU_BITS_PER_CHAR == 16);
-STATIC_ASSERT(sizeof(uint16_t) * CPU_BITS_PER_CHAR == 16);
-STATIC_ASSERT(sizeof(int32_t) * CPU_BITS_PER_CHAR == 32);
-STATIC_ASSERT(sizeof(uint32_t) * CPU_BITS_PER_CHAR == 32);
-#ifdef __HAS_INT64_T__
-STATIC_ASSERT(sizeof(int64_t) * CPU_BITS_PER_CHAR == 64);
-STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
-#endif
-
-/**
- * \def CPU_IDLE
- *
- * \brief Invoked by the scheduler to stop the CPU when idle.
- *
- * This hook can be redefined to put the CPU in low-power mode, or to
- * profile system load with an external strobe, or to save CPU cycles
- * in hosted environments such as emulators.
- */
-#ifndef CPU_IDLE
-       #if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
-               /* This emulator hook should yield the CPU to the host.  */
-               EXTERN_C_BEGIN
-               void emul_idle(void);
-               EXTERN_C_END
-               #define CPU_IDLE emul_idle()
-       #else /* !ARCH_EMUL */
-               #define CPU_IDLE do { /* nothing */ } while (0)
-       #endif /* !ARCH_EMUL */
-#endif /* !CPU_IDLE */
-
-#endif /* DEVLIB_CPU_H */
index a99285dc19746e24dfb4c625872fdcfd7f977ce2..8a9457290f9492740a0435dcb96ff681a85dbd36 100644 (file)
--- a/cpu/cpu.h
+++ b/cpu/cpu.h
@@ -26,7 +26,7 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2004, 2005,2006, 2007 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2004 Giovanni Bajo
  *
  * -->
  * \author Giovanni Bajo <rasky@develer.com>
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
- * \author Francesco Sacchi <batt@develer.com>
  */
-#ifndef CPU_CPU_H
-#define CPU_CPU_H
-
-#include "detect.h"
+#ifndef DEVLIB_CPU_H
+#define DEVLIB_CPU_H
 
 #include <cfg/compiler.h> /* for uintXX_t */
 #include <cfg/arch_config.h>  /* ARCH_EMUL */
 
        #else /* !__IAR_SYSTEMS_ICC__ */
 
+               #warning "IRQ_ macros need testing!"
+               #warning "Test now or die :-)"
+
                #define NOP         asm volatile ("mov r0,r0" ::)
 
                #define IRQ_DISABLE \
@@ -549,4 +549,4 @@ STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
        #endif /* !ARCH_EMUL */
 #endif /* !CPU_IDLE */
 
-#endif /* CPU_CPU_H */
+#endif /* DEVLIB_CPU_H */