X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcpu.h;h=ff277d62faee5589b70f0d4422fc7b921e374a2d;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=2962d88412088455c8b72dcfffa08cb76b051922;hpb=e5b04dc12f28c225dfcc92931bed4598fcf4b639;p=bertos.git

diff --git a/cfg/cpu.h b/cfg/cpu.h
old mode 100755
new mode 100644
index 2962d884..ff277d62
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -8,75 +8,29 @@
  *
  * \brief CPU-specific definitions
  *
- * \version $Id$
- *
  * \author Giovanni Bajo <rasky@develer.com>
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
-
-/*#*
- *#* $Log$
- *#* Revision 1.8  2006/02/10 12:37:45  bernie
- *#* Add support for ARM on IAR.
- *#*
- *#* Revision 1.7  2005/11/27 03:04:38  bernie
- *#* Add POSIX emulation for IRQ_* macros; Add Qt support.
- *#*
- *#* Revision 1.6  2005/07/19 07:26:49  bernie
- *#* Add missing #endif.
- *#*
- *#* Revision 1.5  2005/06/27 21:24:17  bernie
- *#* CPU_CSOURCE(): New macro.
- *#*
- *#* Revision 1.4  2005/06/14 06:15:10  bernie
- *#* Add X86_64 support.
- *#*
- *#* Revision 1.3  2005/04/12 04:06:17  bernie
- *#* Catch missing CPU earlier.
- *#*
- *#* Revision 1.2  2005/04/11 19:10:27  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.1  2005/04/11 19:04:13  bernie
- *#* Move top-level headers to cfg/ subdir.
- *#*
- *#* Revision 1.30  2005/03/15 00:20:09  bernie
- *#* BREAKPOINT, IRQ_RUNNING(), IRQ_GETSTATE(): New DSP56K macros.
- *#*
- *#* Revision 1.29  2005/02/16 20:33:24  bernie
- *#* Preliminary PPC support.
- *#*
- *#* 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.
- *#*/
 #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
+#define CPU_LITTLE_ENDIAN 0x3412 /* Look twice, pal. This is not a bug. */
 /*\}*/
 
-/*! Macro to include cpu-specific versions of the headers. */
+/** 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. */
+/** Macro to include cpu-specific versions of implementation files. */
 #define CPU_CSOURCE(module)         PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).c)
 
 
@@ -112,6 +66,7 @@
 
 
 	#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
@@ -132,31 +87,55 @@
 
 #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(); \
+			(x) = get_CPSR(); \
 			__disable_interrupt(); \
 		} while (0)
 
 		#define IRQ_RESTORE(x) \
 		do { \
-			__set_CPSR(x); \
+			set_CPSR(x); \
 		} while (0)
 
 		#define IRQ_GETSTATE() \
-			((bool)(__get_CPSR() & 0xb0))
+			((bool)(get_CPSR() & 0xb0))
+
+		#define BREAKPOINT  /* asm("bkpt 0") DOES NOT WORK */
 
-	#else /* __IAR_SYSTEMS_ICC__ */
+	#else /* !__IAR_SYSTEMS_ICC__ */
 
 		#warning "IRQ_ macros need testing!"
+		#warning "Test now or die :-)"
 
 		#define NOP         asm volatile ("mov r0,r0" ::)
 
@@ -164,9 +143,9 @@
 		do { \
 			asm volatile ( \
 				"mrs r0, cpsr\n\t" \
-				"orr r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
-				:: \
+				"orr r0, r0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
+				::: "r0" \
 			); \
 		} while (0)
 
@@ -174,19 +153,18 @@
 		do { \
 			asm volatile ( \
 				"mrs r0, cpsr\n\t" \
-				"bic r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
-				:: \
+				"bic r0, r0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
+				::: "r0" \
 			); \
 		} while (0)
 
 		#define IRQ_SAVE_DISABLE(x) \
 		do { \
 			asm volatile ( \
-				"mrs r0, cpsr\n\t" \
-				"mov %0, r0\n\t" \
-				"orr r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
+				"mrs %0, cpsr\n\t" \
+				"orr r0, %0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
 				: "=r" (x) \
 				: /* no inputs */ \
 				: "r0" \
@@ -196,11 +174,9 @@
 		#define IRQ_RESTORE(x) \
 		do { \
 			asm volatile ( \
-				"mov r0, %0\n\t" \
-				"msr cpsr, r0" \
+				"msr cpsr_c, %0" \
 				: /* no outputs */ \
 				: "r" (x) \
-				: "r0" \
 			); \
 		} while (0)
 
@@ -208,28 +184,14 @@
 		({ \
 			uint32_t sreg; \
 			asm volatile ( \
-				"mrs r0, cpsr\n\t" \
-				"mov %0, r0" \
-				: "=r" (sreg)
-				: /* no inputs */
-				: "r0" \
+				"mrs %0, cpsr\n\t" \
+				: "=r" (sreg) \
+				: /* no inputs */ \
 			); \
-			(bool)(sreg & 0xb0); \
+			!((sreg & 0xc0) == 0xc0); \
 		})
 
-	#endif /* __IAR_SYSTEMS_ICC_ */
-
-	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  //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
+	#endif /* !__IAR_SYSTEMS_ICC_ */
 
 #elif CPU_PPC
 	#define NOP                 asm volatile ("nop" ::)
@@ -341,7 +303,7 @@
 	#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
@@ -353,7 +315,7 @@
 	#error No CPU_... defined.
 #endif
 
-/*!
+/**
  * Execute \a CODE atomically with respect to interrupts.
  *
  * \see IRQ_SAVE_DISABLE IRQ_RESTORE
@@ -367,7 +329,7 @@
 	} while (0)
 
 
-//! Default for macro not defined in the right arch section
+/// Default for macro not defined in the right arch section
 #ifndef CPU_REG_INIT_VALUE
 	#define CPU_REG_INIT_VALUE(reg)     0
 #endif
@@ -443,11 +405,11 @@
 
 #else
 	#define CPU_PUSH_CALL_CONTEXT(sp, func) \
-		CPU_PUSH_WORD((sp), (func))
+		CPU_PUSH_WORD((sp), (cpustack_t)(func))
 #endif
 
 
-/*!
+/**
  * \name Default type sizes.
  *
  * These defaults are reasonable for most 16/32bit machines.
@@ -541,7 +503,7 @@ 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.
@@ -554,15 +516,12 @@ STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
 	#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
 		/* This emulator hook should yield the CPU to the host.  */
 		EXTERN_C_BEGIN
-		void SchedulerIdle(void);
+		void emul_idle(void);
 		EXTERN_C_END
-		#define CPU_IDLE SchedulerIdle()
+		#define CPU_IDLE emul_idle()
 	#else /* !ARCH_EMUL */
 		#define CPU_IDLE do { /* nothing */ } while (0)
 	#endif /* !ARCH_EMUL */
 #endif /* !CPU_IDLE */
 
-/* OBSOLETE */
-#define SCHEDULER_IDLE CPU_IDLE
-
 #endif /* DEVLIB_CPU_H */